aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-01-19 03:29:57 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-01-27 14:56:53 -0500
commitc1288b1278d00169e12495eb53ad128e09560b69 (patch)
tree8edc1a74f040763f406abe830cea98eac4b6124d /net/mac80211/mlme.c
parent47d505ccc7535c825f6b28aaaf105d4b75f25196 (diff)
mac80211: make beacon filtering per virtual interface
Due to firmware limitations, we may not be able to support beacon filtering on all virtual interfaces. To allow this in mac80211, introduce per-interface driver capability flags that the driver sets when an interface is added. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Acked-by: Luciano Coelho <coelho@ti.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 95d3964fc080..b51eb49d8525 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -127,7 +127,7 @@ static void run_again(struct ieee80211_if_managed *ifmgd,
127 127
128void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata) 128void ieee80211_sta_reset_beacon_monitor(struct ieee80211_sub_if_data *sdata)
129{ 129{
130 if (sdata->local->hw.flags & IEEE80211_HW_BEACON_FILTER) 130 if (sdata->vif.driver_flags & IEEE80211_VIF_BEACON_FILTER)
131 return; 131 return;
132 132
133 mod_timer(&sdata->u.mgd.bcn_mon_timer, 133 mod_timer(&sdata->u.mgd.bcn_mon_timer,