diff options
Diffstat (limited to 'drivers/net/ns83820.c')
-rw-r--r-- | drivers/net/ns83820.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index c336b46bd332..e64df4d0800b 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
@@ -101,6 +101,7 @@ | |||
101 | #include <linux/moduleparam.h> | 101 | #include <linux/moduleparam.h> |
102 | #include <linux/types.h> | 102 | #include <linux/types.h> |
103 | #include <linux/pci.h> | 103 | #include <linux/pci.h> |
104 | #include <linux/dma-mapping.h> | ||
104 | #include <linux/netdevice.h> | 105 | #include <linux/netdevice.h> |
105 | #include <linux/etherdevice.h> | 106 | #include <linux/etherdevice.h> |
106 | #include <linux/delay.h> | 107 | #include <linux/delay.h> |
@@ -573,7 +574,7 @@ static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb) | |||
573 | 574 | ||
574 | dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC; | 575 | dev->rx_info.next_empty = (next_empty + 1) % NR_RX_DESC; |
575 | cmdsts = REAL_RX_BUF_SIZE | CMDSTS_INTR; | 576 | cmdsts = REAL_RX_BUF_SIZE | CMDSTS_INTR; |
576 | buf = pci_map_single(dev->pci_dev, skb->tail, | 577 | buf = pci_map_single(dev->pci_dev, skb->data, |
577 | REAL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); | 578 | REAL_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); |
578 | build_rx_desc(dev, sg, 0, buf, cmdsts, 0); | 579 | build_rx_desc(dev, sg, 0, buf, cmdsts, 0); |
579 | /* update link of previous rx */ | 580 | /* update link of previous rx */ |
@@ -603,7 +604,7 @@ static inline int rx_refill(struct net_device *ndev, int gfp) | |||
603 | if (unlikely(!skb)) | 604 | if (unlikely(!skb)) |
604 | break; | 605 | break; |
605 | 606 | ||
606 | res = (long)skb->tail & 0xf; | 607 | res = (long)skb->data & 0xf; |
607 | res = 0x10 - res; | 608 | res = 0x10 - res; |
608 | res &= 0xf; | 609 | res &= 0xf; |
609 | skb_reserve(skb, res); | 610 | skb_reserve(skb, res); |