From 8f1eabdbdd09bec4a2adbee0ec20a13c8e4a5426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dave=20T=C3=A4ht?= <dave.taht@bufferbloat.net>
Date: Thu, 22 Dec 2011 12:55:08 -0800
Subject: [PATCH] --- yaml --- r: 279447 b: refs/heads/master c:
 b156579b1404871d97d2713c1f93c9526618e3ba h: refs/heads/master i:   279445:
 f969dd8fd61693f85b023659dd8e83071ba3c3ca   279443:
 4d18a72263cf271002f72708c573b4ddb4ea732e   279439:
 cf94cbf6125540b070b739d79310ef82bb8fbe05 v: v3

---
 [refs]                    | 2 +-
 trunk/net/wireless/util.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f12fe3aee187..1be32cafebb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 288e0713f469c03dbc412153b5341d6dfc2c9907
+refs/heads/master: b156579b1404871d97d2713c1f93c9526618e3ba
diff --git a/trunk/net/wireless/util.c b/trunk/net/wireless/util.c
index e77df7585004..9aa9db6c8141 100644
--- a/trunk/net/wireless/util.c
+++ b/trunk/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;