aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-11 17:16:58 -0400
committerDavid S. Miller <davem@davemloft.net>2014-03-12 16:22:13 -0400
commit2bb77ab42a6a40162a367b80394b96bb756ad5f1 (patch)
tree8c8d28b1641699c72bdfa35bb3f53b37a407f1f8 /drivers/net/bonding
parent989c9ba104d9ce53c1ca918262f3fdfb33aca12a (diff)
bonding: Call dev_kfree_skby_any instead of kfree_skb.
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>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_3ad.c2
-rw-r--r--drivers/net/bonding/bond_alb.c2
-rw-r--r--drivers/net/bonding/bond_main.c10
3 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index a2ef3f72de88..dee2a84a2929 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2479,7 +2479,7 @@ out:
2479 return NETDEV_TX_OK; 2479 return NETDEV_TX_OK;
2480err_free: 2480err_free:
2481 /* no suitable interface, frame not sent */ 2481 /* no suitable interface, frame not sent */
2482 kfree_skb(skb); 2482 dev_kfree_skb_any(skb);
2483 goto out; 2483 goto out;
2484} 2484}
2485 2485
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index aaeeacf767f2..9cf836b67b15 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1464,7 +1464,7 @@ int bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev)
1464 } 1464 }
1465 1465
1466 /* no suitable interface, frame not sent */ 1466 /* no suitable interface, frame not sent */
1467 kfree_skb(skb); 1467 dev_kfree_skb_any(skb);
1468out: 1468out:
1469 return NETDEV_TX_OK; 1469 return NETDEV_TX_OK;
1470} 1470}
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 324389b44915..e717db301d46 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -3548,7 +3548,7 @@ static void bond_xmit_slave_id(struct bonding *bond, struct sk_buff *skb, int sl
3548 } 3548 }
3549 } 3549 }
3550 /* no slave that can tx has been found */ 3550 /* no slave that can tx has been found */
3551 kfree_skb(skb); 3551 dev_kfree_skb_any(skb);
3552} 3552}
3553 3553
3554/** 3554/**
@@ -3624,7 +3624,7 @@ static int bond_xmit_activebackup(struct sk_buff *skb, struct net_device *bond_d
3624 if (slave) 3624 if (slave)
3625 bond_dev_queue_xmit(bond, skb, slave->dev); 3625 bond_dev_queue_xmit(bond, skb, slave->dev);
3626 else 3626 else
3627 kfree_skb(skb); 3627 dev_kfree_skb_any(skb);
3628 3628
3629 return NETDEV_TX_OK; 3629 return NETDEV_TX_OK;
3630} 3630}
@@ -3667,7 +3667,7 @@ static int bond_xmit_broadcast(struct sk_buff *skb, struct net_device *bond_dev)
3667 if (slave && IS_UP(slave->dev) && slave->link == BOND_LINK_UP) 3667 if (slave && IS_UP(slave->dev) && slave->link == BOND_LINK_UP)
3668 bond_dev_queue_xmit(bond, skb, slave->dev); 3668 bond_dev_queue_xmit(bond, skb, slave->dev);
3669 else 3669 else
3670 kfree_skb(skb); 3670 dev_kfree_skb_any(skb);
3671 3671
3672 return NETDEV_TX_OK; 3672 return NETDEV_TX_OK;
3673} 3673}
@@ -3754,7 +3754,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev
3754 pr_err("%s: Error: Unknown bonding mode %d\n", 3754 pr_err("%s: Error: Unknown bonding mode %d\n",
3755 dev->name, bond->params.mode); 3755 dev->name, bond->params.mode);
3756 WARN_ON_ONCE(1); 3756 WARN_ON_ONCE(1);
3757 kfree_skb(skb); 3757 dev_kfree_skb_any(skb);
3758 return NETDEV_TX_OK; 3758 return NETDEV_TX_OK;
3759 } 3759 }
3760} 3760}
@@ -3775,7 +3775,7 @@ static netdev_tx_t bond_start_xmit(struct sk_buff *skb, struct net_device *dev)
3775 if (bond_has_slaves(bond)) 3775 if (bond_has_slaves(bond))
3776 ret = __bond_start_xmit(skb, dev); 3776 ret = __bond_start_xmit(skb, dev);
3777 else 3777 else
3778 kfree_skb(skb); 3778 dev_kfree_skb_any(skb);
3779 rcu_read_unlock(); 3779 rcu_read_unlock();
3780 3780
3781 return ret; 3781 return ret;