diff options
| author | Alexander Duyck <alexander.h.duyck@redhat.com> | 2015-05-01 19:34:44 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-04 06:06:55 +0200 |
| commit | eb781397904e5d6b90c80463eaa9dc592831bdae (patch) | |
| tree | b7265c3a79c6dd56e70858d88a74c32840f932a2 /drivers/net/ethernet/realtek/r8169.c | |
| parent | fm10k: Do not assume budget will never be 0 for NAPI (diff) | |
| download | linux-eb781397904e5d6b90c80463eaa9dc592831bdae.tar.xz linux-eb781397904e5d6b90c80463eaa9dc592831bdae.zip | |
r8169: Do not use dev_kfree_skb in xmit path
The function r8169_csum_workaround is called in the ndo_start_xmit path of
the r8169 driver. As such it should not be using dev_kfree_skb as it is
not irq safe, so instead we should be using dev_kfree_skb_any for freeing
in the dropped path, and dev_consume_skb_any for any frames that were
transmitted.
Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek/r8169.c')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index c70ab40d8698..3df51faf18ae 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -6884,7 +6884,7 @@ static void r8169_csum_workaround(struct rtl8169_private *tp, rtl8169_start_xmit(nskb, tp->dev); } while (segs); - dev_kfree_skb(skb); + dev_consume_skb_any(skb); } else if (skb->ip_summed == CHECKSUM_PARTIAL) { if (skb_checksum_help(skb) < 0) goto drop; @@ -6896,7 +6896,7 @@ static void r8169_csum_workaround(struct rtl8169_private *tp, drop: stats = &tp->dev->stats; stats->tx_dropped++; - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); } } |