diff --git a/[refs] b/[refs] index dd61cc5f6fcd..788c7db0c188 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43ac2ca3840f64f699a239535c590fa7ebaaac27 +refs/heads/master: 2f58bbf27fe5321a7a208be9071efc54e8a8a3bd diff --git a/trunk/net/mac80211/wme.c b/trunk/net/mac80211/wme.c index 4310e2f65661..7229e958879d 100644 --- a/trunk/net/mac80211/wme.c +++ b/trunk/net/mac80211/wme.c @@ -47,8 +47,6 @@ static unsigned int classify_1d(struct sk_buff *skb) return 0; } - if (dscp & 0x1c) - return 0; return dscp >> 5; }