[netdrvr s2io] warning fixes
From Andrew Morton.
This commit is contained in:
parent
ecf8b596cf
commit
50eb800680
|
@ -2110,7 +2110,7 @@ int fill_rxd_3buf(nic_t *nic, RxD_t *rxdp, struct sk_buff *skb)
|
||||||
{
|
{
|
||||||
struct net_device *dev = nic->dev;
|
struct net_device *dev = nic->dev;
|
||||||
struct sk_buff *frag_list;
|
struct sk_buff *frag_list;
|
||||||
u64 tmp;
|
void *tmp;
|
||||||
|
|
||||||
/* Buffer-1 receives L3/L4 headers */
|
/* Buffer-1 receives L3/L4 headers */
|
||||||
((RxD3_t*)rxdp)->Buffer1_ptr = pci_map_single
|
((RxD3_t*)rxdp)->Buffer1_ptr = pci_map_single
|
||||||
|
@ -2125,11 +2125,9 @@ int fill_rxd_3buf(nic_t *nic, RxD_t *rxdp, struct sk_buff *skb)
|
||||||
}
|
}
|
||||||
frag_list = skb_shinfo(skb)->frag_list;
|
frag_list = skb_shinfo(skb)->frag_list;
|
||||||
frag_list->next = NULL;
|
frag_list->next = NULL;
|
||||||
tmp = (u64) frag_list->data;
|
tmp = (void *)ALIGN((long)frag_list->data, ALIGN_SIZE + 1);
|
||||||
tmp += ALIGN_SIZE;
|
frag_list->data = tmp;
|
||||||
tmp &= ~ALIGN_SIZE;
|
frag_list->tail = tmp;
|
||||||
frag_list->data = (void *) tmp;
|
|
||||||
frag_list->tail = (void *) tmp;
|
|
||||||
|
|
||||||
/* Buffer-2 receives L4 data payload */
|
/* Buffer-2 receives L4 data payload */
|
||||||
((RxD3_t*)rxdp)->Buffer2_ptr = pci_map_single(nic->pdev,
|
((RxD3_t*)rxdp)->Buffer2_ptr = pci_map_single(nic->pdev,
|
||||||
|
|
Loading…
Reference in a new issue