2013-06-25 18:52:55

by Cedric VONCKEN

Subject: [PATCH] wireless: vlan priority handling in WMM

From: Cedric Voncken <[email protected]>

If the VLAN priority is set in skb->vlan_tci use it to determine the WMM priority.

Signed-off-by: Cedric Voncken <[email protected]>
---
net/wireless/util.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 74458b7..6f57ae7 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -685,6 +685,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
@@ -694,6 +695,10 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb)
if (skb->priority >= 256 && skb->priority <= 263)
return skb->priority - 256;

+ vlan_priority = (skb->vlan_tci >> 13) & 0x07;
+ 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

2013-06-26 07:33:51

by Johannes Berg

Subject: Re: [PATCH] wireless: vlan priority handling in WMM

On Tue, 2013-06-25 at 17:31 +0200, [email protected] wrote:
> From: Cedric Voncken <[email protected]>
>
> If the VLAN priority is set in skb->vlan_tci use it to determine the WMM priority.

What's the VLAN priority? How are you even running 802.1q on top of
wifi? heh.

> @@ -694,6 +695,10 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb)
> if (skb->priority >= 256 && skb->priority <= 263)
> return skb->priority - 256;
>
> + vlan_priority = (skb->vlan_tci >> 13) & 0x07;

Are there no symbolic constants for this?

> + if (vlan_priority > 0)
> + return vlan_priority;

I think you got indentation a bit confused :-)

johannes

2013-06-26 09:36:17

by Cedric VONCKEN

Subject: RE: [PATCH] wireless: vlan priority handling in WMM

>>On Tue, 2013-06-25 at 17:31 +0200, [email protected] wrote:
>> From: Cedric Voncken <[email protected]>
>>
>> If the VLAN priority is set in skb->vlan_tci use it to determine the WMM priority.

>What's the VLAN priority? How are you even running 802.1q on top of wifi? heh.
I used the wireless as bridge (The wireless vif client is bridged with my eth0). The VLAN tag is already present in frame when I received it from eth0. The eth0 driver set the skb->vlan_tci.

>> @@ -694,6 +695,10 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb)
>> if (skb->priority >= 256 && skb->priority <= 263)
>> return skb->priority - 256;
>>
>> + vlan_priority = (skb->vlan_tci >> 13) & 0x07;

>Are there no symbolic constants for this?
Fix in V2

>> + if (vlan_priority > 0)
>> + return vlan_priority;

>I think you got indentation a bit confused :-)
Sorry, it will fix in V2.

Cedric