diff options
| author | David S. Miller <davem@davemloft.net> | 2016-07-01 17:05:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-07-01 17:05:00 -0400 |
| commit | 3ea00443f1b17405ce9e1421bb7706777339926e (patch) | |
| tree | bc2708a8e693cc19ca8a6501c4307a3f62055d99 /net/batman-adv/routing.c | |
| parent | ca9354a1d47d8e30dee114fc946fd71f1d403ca7 (diff) | |
| parent | 4e3e823b5a503235630921287f130e1d8d22d200 (diff) | |
| download | linux-stable-3ea00443f1b17405ce9e1421bb7706777339926e.tar.gz linux-stable-3ea00443f1b17405ce9e1421bb7706777339926e.tar.bz2 linux-stable-3ea00443f1b17405ce9e1421bb7706777339926e.zip | |
Merge tag 'batadv-next-for-davem-20160701' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature patchset includes the following changes:
- two patches with minimal clean up work by Antonio Quartulli and
Simon Wunderlich
- eight patches of B.A.T.M.A.N. V, API and documentation clean
up work, by Antonio Quartulli and Marek Lindner
- Andrew Lunn fixed the skb priority adoption when forwarding
fragmented packets (two patches)
- Multicast optimization support is now enabled for bridges which
comes with some protocol updates, by Linus Luessing
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/routing.c')
| -rw-r--r-- | net/batman-adv/routing.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 396c0134c5ab..319a58820197 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1007,6 +1007,8 @@ int batadv_recv_frag_packet(struct sk_buff *skb, if (!orig_node_src) goto out; + skb->priority = frag_packet->priority + 256; + /* Route the fragment if it is not for us and too big to be merged. */ if (!batadv_is_my_mac(bat_priv, frag_packet->dest) && batadv_frag_skb_fwd(skb, recv_if, orig_node_src)) { |