diff options
Diffstat (limited to 'drivers/net/epic100.c')
-rw-r--r-- | drivers/net/epic100.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 3a6a83d3ee1c..4e3f14c9c717 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -934,7 +934,6 @@ static void epic_init_ring(struct net_device *dev) | |||
934 | ep->rx_skbuff[i] = skb; | 934 | ep->rx_skbuff[i] = skb; |
935 | if (skb == NULL) | 935 | if (skb == NULL) |
936 | break; | 936 | break; |
937 | skb->dev = dev; /* Mark as being used by this device. */ | ||
938 | skb_reserve(skb, 2); /* 16 byte align the IP header. */ | 937 | skb_reserve(skb, 2); /* 16 byte align the IP header. */ |
939 | ep->rx_ring[i].bufaddr = pci_map_single(ep->pci_dev, | 938 | ep->rx_ring[i].bufaddr = pci_map_single(ep->pci_dev, |
940 | skb->data, ep->rx_buf_sz, PCI_DMA_FROMDEVICE); | 939 | skb->data, ep->rx_buf_sz, PCI_DMA_FROMDEVICE); |
@@ -1199,7 +1198,6 @@ static int epic_rx(struct net_device *dev, int budget) | |||
1199 | to a minimally-sized skbuff. */ | 1198 | to a minimally-sized skbuff. */ |
1200 | if (pkt_len < rx_copybreak | 1199 | if (pkt_len < rx_copybreak |
1201 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 1200 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { |
1202 | skb->dev = dev; | ||
1203 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 1201 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
1204 | pci_dma_sync_single_for_cpu(ep->pci_dev, | 1202 | pci_dma_sync_single_for_cpu(ep->pci_dev, |
1205 | ep->rx_ring[entry].bufaddr, | 1203 | ep->rx_ring[entry].bufaddr, |
@@ -1236,7 +1234,6 @@ static int epic_rx(struct net_device *dev, int budget) | |||
1236 | skb = ep->rx_skbuff[entry] = dev_alloc_skb(ep->rx_buf_sz); | 1234 | skb = ep->rx_skbuff[entry] = dev_alloc_skb(ep->rx_buf_sz); |
1237 | if (skb == NULL) | 1235 | if (skb == NULL) |
1238 | break; | 1236 | break; |
1239 | skb->dev = dev; /* Mark as being used by this device. */ | ||
1240 | skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ | 1237 | skb_reserve(skb, 2); /* Align IP on 16 byte boundaries */ |
1241 | ep->rx_ring[entry].bufaddr = pci_map_single(ep->pci_dev, | 1238 | ep->rx_ring[entry].bufaddr = pci_map_single(ep->pci_dev, |
1242 | skb->data, ep->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1239 | skb->data, ep->rx_buf_sz, PCI_DMA_FROMDEVICE); |