diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-04-20 08:46:22 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:52 +0200 |
| commit | aca1adce326e06dcdb18e8201719ad7eaab274f5 (patch) | |
| tree | 43d840ef97ef48263e5b05263dff04ec41ec6b13 | |
| parent | 3980686d6ccb1201b543a590fc31bc839157bb5b (diff) | |
cw1200: Fix after interface change in mac80211 for 3.4
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | drivers/staging/cw1200/main.c | 4 | ||||
| -rw-r--r-- | drivers/staging/cw1200/sta.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/cw1200/main.c b/drivers/staging/cw1200/main.c index 06434629dcd..c31a4d45929 100644 --- a/drivers/staging/cw1200/main.c +++ b/drivers/staging/cw1200/main.c @@ -256,8 +256,6 @@ struct ieee80211_hw *cw1200_init_common(size_t priv_data_len) IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_SUPPORTS_UAPSD | IEEE80211_HW_CONNECTION_MONITOR | - IEEE80211_HW_SUPPORTS_CQM_RSSI | - IEEE80211_HW_NEED_DTIM_PERIOD | /* Aggregation is fully controlled by firmware. * Do not need any support from the mac80211 stack */ /* IEEE80211_HW_AMPDU_AGGREGATION | */ @@ -266,7 +264,7 @@ struct ieee80211_hw *cw1200_init_common(size_t priv_data_len) IEEE80211_HW_SUPPORTS_CQM_BEACON_MISS | IEEE80211_HW_SUPPORTS_CQM_TX_FAIL | #endif /* CONFIG_CW1200_USE_STE_EXTENSIONS */ - IEEE80211_HW_BEACON_FILTER; + IEEE80211_HW_NEED_DTIM_PERIOD; hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC) | diff --git a/drivers/staging/cw1200/sta.c b/drivers/staging/cw1200/sta.c index 54b681aba0e..cc9ed7b1507 100644 --- a/drivers/staging/cw1200/sta.c +++ b/drivers/staging/cw1200/sta.c @@ -158,6 +158,9 @@ int cw1200_add_interface(struct ieee80211_hw *dev, struct cw1200_common *priv = dev->priv; /* __le32 auto_calibration_mode = __cpu_to_le32(1); */ + vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER | + IEEE80211_VIF_SUPPORTS_CQM_RSSI; + mutex_lock(&priv->conf_mutex); if (priv->mode != NL80211_IFTYPE_MONITOR) { |