Repository : ssh://git@open-mesh.org/batman-adv
On branch : maint
commit 9ed2fc77a4f0ec36bdb7f56929f6af45a5abb173 Author: Martin Hundebøll martin@hundeboll.net Date: Wed Sep 17 08:56:19 2014 +0200
batman-adv: clear control block of received socket buffers
Since other network components (and some drivers) uses the control block provided in skb's, the network coding feature might wrongly assume that an SKB has been decoded, and thus not try to code it with another packet again. This happens for instance when batman-adv is running on a bridge device.
Fix this by clearing the control block for every received SKB.
Introduced by 3c12de9a5c756b23fe7c9ab332474ece1568914c ("batman-adv: network coding - code and transmit packets if possible") Signed-off-by: Martin Hundebøll martin@hundeboll.net Signed-off-by: Marek Lindner mareklindner@neomailbox.ch
9ed2fc77a4f0ec36bdb7f56929f6af45a5abb173 main.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/main.c b/main.c index d1183e8..244dfe9 100644 --- a/main.c +++ b/main.c @@ -403,6 +403,9 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, goto err_free; }
+ /* reset control block to avoid left overs from previous users */ + memset(skb->cb, 0, sizeof(struct batadv_skb_cb)); + /* all receive handlers return whether they received or reused * the supplied skb. if not, we have to free the skb. */