| From | Ben Hutchings <> | Date | Tue, 05 May 2015 02:16:39 +0100 | Subject | [PATCH 3.2 211/221] ixgb: Call dev_kfree_skby_any instead of dev_kfree_skb. |
| |
3.2.69-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Eric W. Biederman" <ebiederm@xmission.com>
commit f7e79913a1d6a6139211ead3b03579b317d25a1f upstream.
Replace dev_kfree_skb with dev_kfree_skb_any in functions that can be called in hard irq and other contexts.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
--- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c @@ -1539,12 +1539,12 @@ ixgb_xmit_frame(struct sk_buff *skb, str int tso; if (test_bit(__IXGB_DOWN, &adapter->flags)) { - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } if (skb->len <= 0) { - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } @@ -1561,7 +1561,7 @@ ixgb_xmit_frame(struct sk_buff *skb, str tso = ixgb_tso(adapter, skb); if (tso < 0) { - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; }
|