diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-06-19 14:43:33 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-20 01:28:02 +0200 |
| commit | 658924dc9ae2ca8e3c46f36306f5dbd501cf4688 (patch) | |
| tree | a10de7dfe5bd02f963455559868d4574cb08724c /drivers/net/hp100.c | |
| parent | Merge branch 'davem.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git/r... (diff) | |
| download | linux-658924dc9ae2ca8e3c46f36306f5dbd501cf4688.tar.xz linux-658924dc9ae2ca8e3c46f36306f5dbd501cf4688.zip | |
hp100: fix an skb->len race
As soon as skb is given to hardware and spinlock released, TX completion
can free skb under us. Therefore, we should update netdev stats before
spinlock release.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hp100.c')
| -rw-r--r-- | drivers/net/hp100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index 8e10d2f6a5ad..c3ecb118c1df 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c @@ -1580,12 +1580,12 @@ static netdev_tx_t hp100_start_xmit_bm(struct sk_buff *skb, hp100_outl(ringptr->pdl_paddr, TX_PDA_L); /* Low Prio. Queue */ lp->txrcommit++; - spin_unlock_irqrestore(&lp->lock, flags); - /* Update statistics */ dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; + spin_unlock_irqrestore(&lp->lock, flags); + return NETDEV_TX_OK; drop: |