diff options
| author | Dave Täht <dave.taht@bufferbloat.net> | 2011-12-22 12:55:08 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-04 14:30:43 -0500 |
| commit | b156579b1404871d97d2713c1f93c9526618e3ba (patch) | |
| tree | c2665f99df8088555b3126c0d2f51c8fa02e303f /net | |
| parent | 288e0713f469c03dbc412153b5341d6dfc2c9907 (diff) | |
| download | linux-3.10-b156579b1404871d97d2713c1f93c9526618e3ba.tar.gz linux-3.10-b156579b1404871d97d2713c1f93c9526618e3ba.tar.bz2 linux-3.10-b156579b1404871d97d2713c1f93c9526618e3ba.zip | |
wireless: Treat IPv6 diffserv the same as IPv4 for 802.11e
Wireless will select a different hardware queue based on the
top 3 bits of the diffserv field, for ipv4. Extend that queue
selection mechanism to ipv6, and make the calls orthogonal.
Signed-off-by: Dave Täht <dave.taht@bufferbloat.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c index e77df758500..9aa9db6c814 100644 --- a/net/wireless/util.c +++ b/net/wireless/util.c @@ -9,6 +9,7 @@ #include <linux/slab.h> #include <net/cfg80211.h> #include <net/ip.h> +#include <net/dsfield.h> #include "core.h" struct ieee80211_rate * @@ -650,7 +651,10 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb) switch (skb->protocol) { case htons(ETH_P_IP): - dscp = ip_hdr(skb)->tos & 0xfc; + dscp = ipv4_get_dsfield(ip_hdr(skb)) & 0xfc; + break; + case htons(ETH_P_IPV6): + dscp = ipv6_get_dsfield(ipv6_hdr(skb)) & 0xfc; break; default: return 0; |