The following commit has been merged in the master branch: commit 7d02d777d4a7eb551999a35f52480c9ddac3d874 Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Fri May 7 21:47:26 2010 +0200

Staging: batman-adv: kfree_skb() in interface_tx() in error case

As we always return that the we consumed the skb, we should also free the skb in the case of an error.

Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de Signed-off-by: Andrew Lunn andrew@lunn.ch Signed-off-by: Greg Kroah-Hartman gregkh@suse.de

diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c index 14b5cca..c3b5288 100644 --- a/drivers/staging/batman-adv/soft-interface.c +++ b/drivers/staging/batman-adv/soft-interface.c @@ -275,6 +275,7 @@ unlock: spin_unlock_irqrestore(&orig_hash_lock, flags); dropped: priv->stats.tx_dropped++; + kfree_skb(skb); end: return NETDEV_TX_OK; }