diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 21:21:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-04 21:21:11 +0100 |
| commit | e3c0ac04f980750a368f7cd5f1b8d1d2cdc1f735 (patch) | |
| tree | 134501057a244b8ae18b87647a7574e4a36e4b5b /drivers/net/smc911x.c | |
| parent | pata_amd/pata_via: de-couple programming of PIO/MWDMA and UDMA timings (diff) | |
| parent | PHY: Add the phy_device_release device method. (diff) | |
| download | linux-e3c0ac04f980750a368f7cd5f1b8d1d2cdc1f735.tar.xz linux-e3c0ac04f980750a368f7cd5f1b8d1d2cdc1f735.zip | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
PHY: Add the phy_device_release device method.
gianfar: fix compile warning
pasemi_mac: Fix reuse of free'd skb
SMC911X: Fix using of dereferenced skb after netif_rx
sky2: recovery deadlock fix
Fix memory corruption in fec_mpc52xx
Don't claim to do IPv6 checksum offload
cxgb - revert file mode changes.
Diffstat (limited to 'drivers/net/smc911x.c')
| -rw-r--r-- | drivers/net/smc911x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 1a3d80bfe9ea..76cc1d3adf71 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -1299,9 +1299,9 @@ smc911x_rx_dma_irq(int dma, void *data) PRINT_PKT(skb->data, skb->len); dev->last_rx = jiffies; skb->protocol = eth_type_trans(skb, dev); - netif_rx(skb); dev->stats.rx_packets++; dev->stats.rx_bytes += skb->len; + netif_rx(skb); spin_lock_irqsave(&lp->lock, flags); pkts = (SMC_GET_RX_FIFO_INF() & RX_FIFO_INF_RXSUSED_) >> 16; |