diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-11 14:16:58 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-27 10:54:53 +0200 |
| commit | 7bdd0c4713725faa303be905741b71ae919b10e3 (patch) | |
| tree | 902e84b78360c4e3f5e9f5814f6c02976737a744 | |
| parent | 939393d35352e30eae6ac3480733f5924eecf648 (diff) | |
bonding: Call dev_kfree_skby_any instead of kfree_skb.
commit 2bb77ab42a6a40162a367b80394b96bb756ad5f1 upstream.
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@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/net/bonding/bond_3ad.c | 2 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_alb.c | 2 | ||||
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index b3c22527b938..13c3ca0b7977 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2477,7 +2477,7 @@ out: read_unlock(&bond->lock); if (res) { /* no suitable interface, frame not sent */ - kfree_skb(skb); + dev_kfree_skb_any(skb); } return NETDEV_TX_OK; diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 71adb692e457..175f266ce82e 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c @@ -1447,7 +1447,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) read_unlock(&bond->lock); if (res) { /* no suitable interface, frame not sent */ - kfree_skb(skb); + dev_kfree_skb_any(skb); } return NETDEV_TX_OK; diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index f5a8b9c83ca6..5f95537d4896 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -3659,7 +3659,7 @@ void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int slave_id) } } /* no slave that can tx has been found */ - kfree_skb(skb); + dev_kfree_skb_any(skb); } static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev) @@ -3702,7 +3702,7 @@ static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_d if (slave) bond_dev_queue_xmit(bond, skb, slave->dev); else - kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } @@ -3746,7 +3746,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev) 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; } @@ -3851,7 +3851,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev 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; } } @@ -3872,7 +3872,7 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev) if (!list_empty(&bond->slave_list)) ret = __bond_start_xmit(skb, dev); else - kfree_skb(skb); + dev_kfree_skb_any(skb); rcu_read_unlock(); return ret; |