| Message ID | 1377518692-30084-1-git-send-email-cedric.voncken@acksys.fr (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
I sent this patch next week, and I have no answer. Is it applied refused? Regards. Cedric Voncken > -----Message d'origine----- > De : cedric.voncken@acksys.fr [mailto:cedric.voncken@acksys.fr] > Envoyé : lundi 26 août 2013 14:05 > À : linux-wireless@vger.kernel.org > Cc : Cedric VONCKEN > Objet : [PATCH V4] cfg80211: vlan priority handling in WMM > > From: cedric Voncken <cedric.voncken@acksys.fr> > > If the VLAN tci is set in skb->vlan_tci use the priority field to determine the > WMM priority. > > Signed-off-by: cedric Voncken <cedric.voncken@acksys.fr> > --- > net/wireless/util.c | 8 ++++++++ > 1 files changed, 8 insertions(+), 0 deletions(-) > > V2 modifications: > Fix indentation > Use symbolic constant > include the header linux/if_vlan.h > > V3 modifications: > Check the vlan_tci validity with macro vlan_tx_tag_present > Get the vlan_tci field value with macro vlan_tx_tag_get > Request to netdev mailling list to know if the VLAN priority value 0 > must be treated as no priority request. I add the Ben Hutchings reply below: > IEEE 802.1q refers to the definition in 802.1d: > > > The user_priority parameter is the priority requested by the > > originating service user. The value of this parameter is in the range > > 0 through 7. > > > > NOTE -- The default user_priority value is 0. Values 1 through 7 > form an > > ordered sequence of user_priorities, with 1 being the lowest value > and > > 7 the highest. See 7.7.3 and Annex G (informative) for further > > explanation of the use of user_priority values. > > So a value of 0 should be treated as no priority request, same as for > an untagged frame. > > V4 modifications: > Fix patch format > > diff --git a/net/wireless/util.c b/net/wireless/util.c index ce090c1..9e4cac2 > 100644 > --- a/net/wireless/util.c > +++ b/net/wireless/util.c > @@ -10,6 +10,7 @@ > #include <net/cfg80211.h> > #include <net/ip.h> > #include <net/dsfield.h> > +#include <linux/if_vlan.h> > #include "core.h" > #include "rdev-ops.h" > > @@ -691,6 +692,7 @@ EXPORT_SYMBOL(ieee80211_amsdu_to_8023s); > unsigned int cfg80211_classify8021d(struct sk_buff *skb) { > unsigned int dscp; > + unsigned char vlan_priority; > > /* skb->priority values from 256->263 are magic values to > * directly indicate a specific 802.1d priority. This is used @@ -700,6 > +702,13 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb) > if (skb->priority >= 256 && skb->priority <= 263) > return skb->priority - 256; > > + if (vlan_tx_tag_present(skb)) { > + vlan_priority = (vlan_tx_tag_get(skb) & VLAN_PRIO_MASK) > + >> VLAN_PRIO_SHIFT; > + if (vlan_priority > 0) > + return vlan_priority; > + } > + > switch (skb->protocol) { > case htons(ETH_P_IP): > dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc; > -- > 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 2013-08-26 at 14:04 +0200, cedric.voncken@acksys.fr wrote: > From: cedric Voncken <cedric.voncken@acksys.fr> > > If the VLAN tci is set in skb->vlan_tci use the priority field to determine the WMM priority. Applied, with a linebreak in that commit log. Your (unnecessary) resend of this also didn't even apply because it was line-wrapped in the patch. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/wireless/util.c b/net/wireless/util.c index ce090c1..9e4cac2 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -10,6 +10,7 @@ #include <net/cfg80211.h> #include <net/ip.h> #include <net/dsfield.h> +#include <linux/if_vlan.h> #include "core.h" #include "rdev-ops.h" @@ -691,6 +692,7 @@ EXPORT_SYMBOL(ieee80211_amsdu_to_8023s); unsigned int cfg80211_classify8021d(struct sk_buff *skb) { unsigned int dscp; + unsigned char vlan_priority; /* skb->priority values from 256->263 are magic values to * directly indicate a specific 802.1d priority. This is used @@ -700,6 +702,13 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb) if (skb->priority >= 256 && skb->priority <= 263) return skb->priority - 256; + if (vlan_tx_tag_present(skb)) { + vlan_priority = (vlan_tx_tag_get(skb) & VLAN_PRIO_MASK) + >> VLAN_PRIO_SHIFT; + if (vlan_priority > 0) + return vlan_priority; + } + switch (skb->protocol) { case htons(ETH_P_IP): dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc;