MPLS labels may contain traffic control information, which should be
evaluated and used by the wireless subsystem if present.
Also check for IEEE 802.21 which is always network control traffic.
Signed-off-by: Simon Wunderlich <sw@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Mathias Kretschmer <mathias.kretschmer@xxxxxxxxxxxxxxxxxxx>
---
net/wireless/util.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/net/wireless/util.c b/net/wireless/util.c
index d39c371..98e3b11 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -11,6 +11,7 @@
#include <net/ip.h>
#include <net/dsfield.h>
#include <linux/if_vlan.h>
+#include <uapi/linux/mpls.h>
#include "core.h"
#include "rdev-ops.h"
@@ -710,6 +711,29 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb,
return vlan_priority;
}
+ if (skb_headlen(skb) >= sizeof(struct ethhdr)) {
+ struct ethhdr *eh = (struct ethhdr *) skb->data;
+ struct mpls_label_stack mpls_tmp, *mpls;
+
+ switch (eh->h_proto) {
+ case __constant_htons(ETH_P_MPLS_UC):
+ case __constant_htons(ETH_P_MPLS_MC):
+ /* MPLS */
+ mpls = skb_header_pointer(skb, sizeof(*eh),
+ sizeof(*mpls), &mpls_tmp);
+ if (!mpls)
+ break;
+
+ return (ntohl(mpls->entry) & MPLS_LS_TC_MASK)
+ >> MPLS_LS_TC_SHIFT;
+ case __constant_htons(ETH_P_80221):
+ /* 802.21 is always network control traffic */
+ return 7;
+ default:
+ break;
+ }
+ }
+
switch (skb->protocol) {
case htons(ETH_P_IP):
dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
