diff options
author | Chun-Yeow Yeoh <yeohchunyeow@gmail.com> | 2012-09-14 06:26:11 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-09-24 15:02:08 -0400 |
commit | 90e6274d2ecf3bcb44e3727a395e56b7ef467218 (patch) | |
tree | ebf4e68eb82bc2c11aa7939993ab6d38a39137bf | |
parent | e37b674156b9d5cd87025f0b4719d60e4ac6060c (diff) |
ath5k: disable HW crypto in management frame
Hardware support for MFP is not available in ath5k. Thus,
this implementation allows the mac80211 stack to do the
actuall crypto operation.
Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/mac80211-ops.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index a0a202de1109..9fd6d9a9942e 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -2446,6 +2446,7 @@ ath5k_init_ah(struct ath5k_hw *ah, const struct ath_bus_ops *bus_ops) | |||
2446 | hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | | 2446 | hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | |
2447 | IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | | 2447 | IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING | |
2448 | IEEE80211_HW_SIGNAL_DBM | | 2448 | IEEE80211_HW_SIGNAL_DBM | |
2449 | IEEE80211_HW_MFP_CAPABLE | | ||
2449 | IEEE80211_HW_REPORTS_TX_ACK_STATUS; | 2450 | IEEE80211_HW_REPORTS_TX_ACK_STATUS; |
2450 | 2451 | ||
2451 | hw->wiphy->interface_modes = | 2452 | hw->wiphy->interface_modes = |
diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c index 4e6b39be43ff..7a28538e6e05 100644 --- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c +++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c | |||
@@ -489,6 +489,9 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
489 | if (ath5k_modparam_nohwcrypt) | 489 | if (ath5k_modparam_nohwcrypt) |
490 | return -EOPNOTSUPP; | 490 | return -EOPNOTSUPP; |
491 | 491 | ||
492 | if (key->flags & IEEE80211_KEY_FLAG_RX_MGMT) | ||
493 | return -EOPNOTSUPP; | ||
494 | |||
492 | if (vif->type == NL80211_IFTYPE_ADHOC && | 495 | if (vif->type == NL80211_IFTYPE_ADHOC && |
493 | (key->cipher == WLAN_CIPHER_SUITE_TKIP || | 496 | (key->cipher == WLAN_CIPHER_SUITE_TKIP || |
494 | key->cipher == WLAN_CIPHER_SUITE_CCMP) && | 497 | key->cipher == WLAN_CIPHER_SUITE_CCMP) && |