This is a note to let you know that I've just added the patch titled bonding: Call dev_kfree_skby_any instead of kfree_skb. to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: bonding-call-dev_kfree_skby_any-instead-of-kfree_skb.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Tue Apr 21 23:05:41 CEST 2015 From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Date: Tue, 11 Mar 2014 14:16:58 -0700 Subject: bonding: Call dev_kfree_skby_any instead of kfree_skb. From: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> Replace 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@xxxxxxxxxxxx> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/bonding/bond_3ad.c | 2 +- drivers/net/bonding/bond_alb.c | 2 +- drivers/net/bonding/bond_main.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2479,7 +2479,7 @@ out: return NETDEV_TX_OK; err_free: /* no suitable interface, frame not sent */ - kfree_skb(skb); + dev_kfree_skb_any(skb); goto out; } --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -1479,7 +1479,7 @@ int bond_alb_xmit(struct sk_buff *skb, s } /* no suitable interface, frame not sent */ - kfree_skb(skb); + dev_kfree_skb_any(skb); out: return NETDEV_TX_OK; } --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3568,7 +3568,7 @@ static void bond_xmit_slave_id(struct bo } } /* no slave that can tx has been found */ - kfree_skb(skb); + dev_kfree_skb_any(skb); } /** @@ -3650,7 +3650,7 @@ static int bond_xmit_activebackup(struct if (slave) bond_dev_queue_xmit(bond, skb, slave->dev); else - kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } @@ -3698,7 +3698,7 @@ static int bond_xmit_broadcast(struct sk if (slave && IS_UP(slave->dev) && slave->link == BOND_LINK_UP) bond_dev_queue_xmit(bond, skb, slave->dev); else - kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } @@ -3785,7 +3785,7 @@ static netdev_tx_t __bond_start_xmit(str pr_err("%s: Error: Unknown bonding mode %d\n", dev->name, bond->params.mode); WARN_ON_ONCE(1); - kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } } @@ -3806,7 +3806,7 @@ static netdev_tx_t bond_start_xmit(struc if (bond_has_slaves(bond)) ret = __bond_start_xmit(skb, dev); else - kfree_skb(skb); + dev_kfree_skb_any(skb); rcu_read_unlock(); return ret; Patches currently in stable-queue which might be from ebiederm@xxxxxxxxxxxx are queue-3.14/tg3-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch queue-3.14/bnx2-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch queue-3.14/mlx4-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch queue-3.14/r8169-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch queue-3.14/8139cp-call-dev_kfree_skby_any-instead-of-kfree_skb.patch queue-3.14/8139too-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch queue-3.14/benet-call-dev_kfree_skby_any-instead-of-kfree_skb.patch queue-3.14/bonding-call-dev_kfree_skby_any-instead-of-kfree_skb.patch queue-3.14/gianfar-carefully-free-skbs-in-functions-called-by-netpoll.patch queue-3.14/ixgb-call-dev_kfree_skby_any-instead-of-dev_kfree_skb.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html