The following commit has been merged in the next branch: commit c0fc1880b5f31e15d5158a131364856e3593b519 Author: Simon Wunderlich siwu@hrz.tu-chemnitz.de Date: Sun Nov 21 17:26:34 2010 +0100
batman-adv: add dropped target in interface_rx
The last merged patch referenced the "dropped" target, which was not present here. This patch adds it.
Signed-off-by: Simon Wunderlich siwu@hrz.tu-chemnitz.de
diff --git a/soft-interface.c b/soft-interface.c index 01dfa19..eff0130 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -195,10 +195,9 @@ void interface_rx(struct net_device *soft_iface, struct bat_priv *priv = netdev_priv(soft_iface);
/* check if enough space is available for pulling, and pull */ - if (!pskb_may_pull(skb, hdr_size)) { - kfree_skb(skb); - return; - } + if (!pskb_may_pull(skb, hdr_size)) + goto dropped; + skb_pull_rcsum(skb, hdr_size); /* skb_set_mac_header(skb, -sizeof(struct ethhdr));*/
@@ -219,6 +218,11 @@ void interface_rx(struct net_device *soft_iface, soft_iface->last_rx = jiffies;
netif_rx(skb); + return; + +dropped: + kfree_skb(skb); + return; }
#ifdef HAVE_NET_DEVICE_OPS