diff options
Diffstat (limited to 'drivers/net/wireless/ath/carl9170/mac.c')
-rw-r--r-- | drivers/net/wireless/ath/carl9170/mac.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c index 53415bfd8bef..e3b1b6e87760 100644 --- a/drivers/net/wireless/ath/carl9170/mac.c +++ b/drivers/net/wireless/ath/carl9170/mac.c | |||
@@ -304,7 +304,8 @@ int carl9170_set_operating_mode(struct ar9170 *ar) | |||
304 | struct ath_common *common = &ar->common; | 304 | struct ath_common *common = &ar->common; |
305 | u8 *mac_addr, *bssid; | 305 | u8 *mac_addr, *bssid; |
306 | u32 cam_mode = AR9170_MAC_CAM_DEFAULTS; | 306 | u32 cam_mode = AR9170_MAC_CAM_DEFAULTS; |
307 | u32 enc_mode = AR9170_MAC_ENCRYPTION_DEFAULTS; | 307 | u32 enc_mode = AR9170_MAC_ENCRYPTION_DEFAULTS | |
308 | AR9170_MAC_ENCRYPTION_MGMT_RX_SOFTWARE; | ||
308 | u32 rx_ctrl = AR9170_MAC_RX_CTRL_DEAGG | | 309 | u32 rx_ctrl = AR9170_MAC_RX_CTRL_DEAGG | |
309 | AR9170_MAC_RX_CTRL_SHORT_FILTER; | 310 | AR9170_MAC_RX_CTRL_SHORT_FILTER; |
310 | u32 sniffer = AR9170_MAC_SNIFFER_DEFAULTS; | 311 | u32 sniffer = AR9170_MAC_SNIFFER_DEFAULTS; |
@@ -318,10 +319,10 @@ int carl9170_set_operating_mode(struct ar9170 *ar) | |||
318 | bssid = common->curbssid; | 319 | bssid = common->curbssid; |
319 | 320 | ||
320 | switch (vif->type) { | 321 | switch (vif->type) { |
321 | case NL80211_IFTYPE_MESH_POINT: | ||
322 | case NL80211_IFTYPE_ADHOC: | 322 | case NL80211_IFTYPE_ADHOC: |
323 | cam_mode |= AR9170_MAC_CAM_IBSS; | 323 | cam_mode |= AR9170_MAC_CAM_IBSS; |
324 | break; | 324 | break; |
325 | case NL80211_IFTYPE_MESH_POINT: | ||
325 | case NL80211_IFTYPE_AP: | 326 | case NL80211_IFTYPE_AP: |
326 | cam_mode |= AR9170_MAC_CAM_AP; | 327 | cam_mode |= AR9170_MAC_CAM_AP; |
327 | 328 | ||