aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/main.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 /drivers/net/wireless/wl12xx/main.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 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r--drivers/net/wireless/wl12xx/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index d5f55a149de5..afc5381f2870 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -2060,6 +2060,8 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
2060 u8 role_type; 2060 u8 role_type;
2061 bool booted = false; 2061 bool booted = false;
2062 2062
2063 vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;
2064
2063 wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM", 2065 wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
2064 ieee80211_vif_type_p2p(vif), vif->addr); 2066 ieee80211_vif_type_p2p(vif), vif->addr);
2065 2067
@@ -4898,7 +4900,6 @@ static int wl1271_init_ieee80211(struct wl1271 *wl)
4898 wl->hw->max_listen_interval = wl->conf.conn.max_listen_interval; 4900 wl->hw->max_listen_interval = wl->conf.conn.max_listen_interval;
4899 4901
4900 wl->hw->flags = IEEE80211_HW_SIGNAL_DBM | 4902 wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |
4901 IEEE80211_HW_BEACON_FILTER |
4902 IEEE80211_HW_SUPPORTS_PS | 4903 IEEE80211_HW_SUPPORTS_PS |
4903 IEEE80211_HW_SUPPORTS_UAPSD | 4904 IEEE80211_HW_SUPPORTS_UAPSD |
4904 IEEE80211_HW_HAS_RATE_CONTROL | 4905 IEEE80211_HW_HAS_RATE_CONTROL |