From b6fe776cbc897e74ec529884828112763de25d79 Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Mon, 26 Sep 2011 09:36:42 +0300 Subject: [PATCH] --- yaml --- r: 266393 b: refs/heads/master c: cd32984f64cb4fdd84e33f30da1f10582fc43cbf h: refs/heads/master i: 266391: 9be7893863aeb838a710ebd84998c146a4e8c406 v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d20c19745b55..196c317ac30b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fb40577b05a869904a8fcf7098d26f3c7809644 +refs/heads/master: cd32984f64cb4fdd84e33f30da1f10582fc43cbf diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index 74d16192fbf0..bf3fc4f264f5 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -2620,7 +2620,7 @@ static int nl80211_new_station(struct sk_buff *skb, struct genl_info *info) /* parse WME attributes if sta is WME capable */ if ((rdev->wiphy.flags & WIPHY_FLAG_AP_UAPSD) && - (params.sta_flags_set & NL80211_STA_FLAG_WME) && + (params.sta_flags_set & BIT(NL80211_STA_FLAG_WME)) && info->attrs[NL80211_ATTR_STA_WME]) { struct nlattr *tb[NL80211_STA_WME_MAX + 1]; struct nlattr *nla;