Commit e0d9677e authored Sep 17, 2014 by Martin Hundebøll Committed by Antonio Quartulli Jan 07, 2015

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 3c12de9a
("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>

Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

parent 32db6aaa

net/batman-adv/main.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -402,6 +402,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.
		*/

Admin message