aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding/bond_3ad.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-06-13 01:30:07 -0400
committerDavid S. Miller <davem@davemloft.net>2012-06-13 19:00:26 -0400
commit0450243096de90ff51c3a6c605410c5e28d79f8d (patch)
tree8772dad022f5f6ae922a68b5b398dec561d1a1c0 /drivers/net/bonding/bond_3ad.c
parent7a282bc37f8a1e7b46907d78724177d20214b137 (diff)
bonding: drop_monitor aware
When packets are dropped in TX path, its better to use kfree_skb() instead of dev_kfree_skb() to give proper drop_monitor events. Also move the kfree_skb() call after read_unlock() in bond_alb_xmit() and bond_xmit_activebackup() Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding/bond_3ad.c')
-rw-r--r--drivers/net/bonding/bond_3ad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 3031e0413114..a030e635f001 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2454,7 +2454,7 @@ int bond_3ad_xmit_xor(struct sk_buff *skb, struct net_device *dev)
2454out: 2454out:
2455 if (res) { 2455 if (res) {
2456 /* no suitable interface, frame not sent */ 2456 /* no suitable interface, frame not sent */
2457 dev_kfree_skb(skb); 2457 kfree_skb(skb);
2458 } 2458 }
2459 2459
2460 return NETDEV_TX_OK; 2460 return NETDEV_TX_OK;