diff options
Diffstat (limited to 'drivers/net/pcnet32.c')
-rw-r--r-- | drivers/net/pcnet32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 80124fac65fa..1c35e1d637a0 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -1227,7 +1227,6 @@ static void pcnet32_rx_entry(struct net_device *dev, | |||
1227 | dev->stats.rx_dropped++; | 1227 | dev->stats.rx_dropped++; |
1228 | return; | 1228 | return; |
1229 | } | 1229 | } |
1230 | skb->dev = dev; | ||
1231 | if (!rx_in_place) { | 1230 | if (!rx_in_place) { |
1232 | skb_reserve(skb, NET_IP_ALIGN); | 1231 | skb_reserve(skb, NET_IP_ALIGN); |
1233 | skb_put(skb, pkt_len); /* Make room */ | 1232 | skb_put(skb, pkt_len); /* Make room */ |
@@ -1406,7 +1405,7 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) | |||
1406 | 1405 | ||
1407 | /* Set interrupt enable. */ | 1406 | /* Set interrupt enable. */ |
1408 | lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN); | 1407 | lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN); |
1409 | mmiowb(); | 1408 | |
1410 | spin_unlock_irqrestore(&lp->lock, flags); | 1409 | spin_unlock_irqrestore(&lp->lock, flags); |
1411 | } | 1410 | } |
1412 | return work_done; | 1411 | return work_done; |
@@ -2598,7 +2597,7 @@ pcnet32_interrupt(int irq, void *dev_id) | |||
2598 | val = lp->a.read_csr(ioaddr, CSR3); | 2597 | val = lp->a.read_csr(ioaddr, CSR3); |
2599 | val |= 0x5f00; | 2598 | val |= 0x5f00; |
2600 | lp->a.write_csr(ioaddr, CSR3, val); | 2599 | lp->a.write_csr(ioaddr, CSR3, val); |
2601 | mmiowb(); | 2600 | |
2602 | __napi_schedule(&lp->napi); | 2601 | __napi_schedule(&lp->napi); |
2603 | break; | 2602 | break; |
2604 | } | 2603 | } |