Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit e374d75036093ae6f8bbd9bb7ed911903f662244 Author: Andrew Lunn andrew@lunn.ch Date: Mon May 9 20:03:35 2016 +0200

batman-adv: Set skb priority in fragments

BATMAN will set the skb->priority based on the IP precedence or 802.1q tag. However, if it needs to fragment the frame, it currently leaves the fragment skb with the default priority and actually overwrites the priority in the unfragmented frame. Fix this.

Signed-off-by: Andrew Lunn andrew@lunn.ch Reviewed-by: Simon Wunderlich sw@simonwunderlich.de Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

e374d75036093ae6f8bbd9bb7ed911903f662244 net/batman-adv/fragmentation.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c index 65536db..a119b6a 100644 --- a/net/batman-adv/fragmentation.c +++ b/net/batman-adv/fragmentation.c @@ -27,7 +27,6 @@ #include <linux/kernel.h> #include <linux/lockdep.h> #include <linux/netdevice.h> -#include <linux/pkt_sched.h> #include <linux/skbuff.h> #include <linux/slab.h> #include <linux/spinlock.h> @@ -414,7 +413,7 @@ static struct sk_buff *batadv_frag_create(struct sk_buff *skb, if (!skb_fragment) goto err;

- skb->priority = TC_PRIO_CONTROL; + skb_fragment->priority = skb->priority;

/* Eat the last mtu-bytes of the skb */ skb_reserve(skb_fragment, header_size + ETH_HLEN);