projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mac80211-next-for-davem-2015-01-19' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
net
/
wireless
/
util.c
diff --git
a/net/wireless/util.c
b/net/wireless/util.c
index
3535e8a
..
97c744e
100644
(file)
--- a/
net/wireless/util.c
+++ b/
net/wireless/util.c
@@
-708,8
+708,8
@@
unsigned int cfg80211_classify8021d(struct sk_buff *skb,
if (skb->priority >= 256 && skb->priority <= 263)
return skb->priority - 256;
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)
+ if (
skb_vlan
_tag_present(skb)) {
+ vlan_priority = (
skb_vlan
_tag_get(skb) & VLAN_PRIO_MASK)
>> VLAN_PRIO_SHIFT;
if (vlan_priority > 0)
return vlan_priority;
>> VLAN_PRIO_SHIFT;
if (vlan_priority > 0)
return vlan_priority;