From 2c59d263c361e170ef23988388960625f212bf59 Mon Sep 17 00:00:00 2001 From: Vivek Natarajan Date: Mon, 2 Mar 2009 20:20:30 +0530 Subject: [PATCH] --- yaml --- r: 135081 b: refs/heads/master c: 25c9c8752849212a25bf7f38b40b64b3958d619b h: refs/heads/master i: 135079: 2aca29c652e0e322c175fd04170adb83b8a24232 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d2e475aed37..1b150a17f0f4 100644 --- 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 index 52d876e3eabe..391445c6b892 100644 --- 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) {