On Wed, 2014-02-12 at 11:53 +0100, Simon Wunderlich wrote: > MPLS labels may contain traffic control information, which should be > evaluated and used by the wireless subsystem if present. trivial notes: > diff --git 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> Please try not to #include uapi files. > @@ -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): __constant_ isn't necessary for these labels. > switch (skb->protocol) { > case htons(ETH_P_IP): > dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc; like this, just case htons(ETH_<FOO>) is enough. -- 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