From: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org
Cc: Marek Lindner
<mareklindner-rVWd3aGhH2z5bpWLKbzFeg@public.gmane.org>,
netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org
Subject: [PATCH 12/17] batman-adv: Set skb priority in fragments
Date: Fri, 1 Jul 2016 15:09:04 +0200 [thread overview]
Message-ID: <1467378549-9646-13-git-send-email-sw@simonwunderlich.de> (raw)
In-Reply-To: <1467378549-9646-1-git-send-email-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
From: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
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-g2DYL2Zd6BY@public.gmane.org>
Signed-off-by: Marek Lindner <mareklindner-rVWd3aGhH2z5bpWLKbzFeg@public.gmane.org>
Signed-off-by: Sven Eckelmann <sven-KaDOiPu9UxWEi8DpZVb4nw@public.gmane.org>
Signed-off-by: Simon Wunderlich <sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
---
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);
--
2.8.1
next prev parent reply other threads:[~2016-07-01 13:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-01 13:08 pull request for net-next: batman-adv 2016-07-01 Simon Wunderlich
[not found] ` <1467378549-9646-1-git-send-email-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
2016-07-01 13:08 ` [PATCH 01/17] batman-adv: Start new development cycle Simon Wunderlich
2016-07-01 13:08 ` [PATCH 02/17] batman-adv: statically print gateway table header Simon Wunderlich
2016-07-01 17:19 ` Joe Perches
2016-07-01 13:08 ` [PATCH 03/17] batman-adv: remove unused vid local variable in tt seq print Simon Wunderlich
2016-07-01 13:08 ` [PATCH 04/17] batman-adv: document sysfs files in alphabetical order Simon Wunderlich
2016-07-01 13:08 ` [PATCH 05/17] batman-adv: update elp interval documentation Simon Wunderlich
2016-07-01 13:08 ` [PATCH 06/17] batman-adv: refactor batadv_neigh_node_* functions to follow common style Simon Wunderlich
2016-07-01 13:08 ` [PATCH 07/17] batman-adv: remove unused callback from batadv_algo_ops struct Simon Wunderlich
2016-07-01 13:09 ` [PATCH 08/17] batman-adv: remove ogm_emit and ogm_schedule API calls Simon Wunderlich
2016-07-01 13:09 ` [PATCH 09/17] batman-adv: remove useless inline attribute for sysfs helper function Simon Wunderlich
2016-07-01 13:09 ` [PATCH 10/17] batman-adv: move GW mode and selection class to private data structure Simon Wunderlich
2016-07-01 13:09 ` [PATCH 11/17] batman-adv: init ELP tweaking options only once Simon Wunderlich
2016-07-01 13:09 ` Simon Wunderlich [this message]
2016-07-01 13:09 ` [PATCH 13/17] batman-adv: Include frame priority in fragment header Simon Wunderlich
2016-07-01 13:09 ` [PATCH 14/17] batman-adv: Always flood IGMP/MLD reports Simon Wunderlich
2016-07-01 13:09 ` [PATCH 15/17] batman-adv: Add multicast optimization support for bridged setups Simon Wunderlich
2016-07-01 13:09 ` [PATCH 16/17] batman-adv: Adding logging of mcast flag changes Simon Wunderlich
2016-07-01 13:09 ` [PATCH 17/17] batman-adv: Add debugfs table for mcast flags Simon Wunderlich
2016-07-01 21:05 ` pull request for net-next: batman-adv 2016-07-01 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467378549-9646-13-git-send-email-sw@simonwunderlich.de \
--to=sw-2yrnx6ruihyiy0qsoawiaoquadtiucjx@public.gmane.org \
--cc=b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=mareklindner-rVWd3aGhH2z5bpWLKbzFeg@public.gmane.org \
--cc=netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).