---

yaml --- r: 135081 b: refs/heads/master c: 25c9c87 h: refs/heads/master i: 135079: 2aca29c v: v3
git-mirror · Mar 5, 2009 · 2c59d26 · 2c59d26
1 parent 774c79d
commit 2c59d26
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0caf9eaae5182ab4e02a5d703ade64719738f87
+refs/heads/master: 25c9c8752849212a25bf7f38b40b64b3958d619b
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
@@ -1458,8 +1458,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
 	ieee80211_sta_wmm_params(local, ifmgd, elems.wmm_param,
 				 elems.wmm_param_len);
 
-	if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK &&
-	    local->hw.conf.flags & IEEE80211_CONF_PS) {
+	if (local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK) {
 		directed_tim = ieee80211_check_tim(&elems, ifmgd->aid);
 
 		if (directed_tim) {