3 files changed, 7 insertions, 1 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)
         hw->flags = IEEE80211_HW_RX_INCLUDES_FCS |
                         IEEE80211_HW_HOST_BROADCAST_PS_BUFFERING |
                         IEEE80211_HW_SIGNAL_DBM |
+                        IEEE80211_HW_MFP_CAPABLE |
                         IEEE80211_HW_REPORTS_TX_ACK_STATUS;
 
         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 df61a09adb6d..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,
         if (ath5k_modparam_nohwcrypt)
                 return -EOPNOTSUPP;
 
+        if (key->flags & IEEE80211_KEY_FLAG_RX_MGMT)
+                return -EOPNOTSUPP;
+
         if (vif->type == NL80211_IFTYPE_ADHOC &&
             (key->cipher == WLAN_CIPHER_SUITE_TKIP ||
              key->cipher == WLAN_CIPHER_SUITE_CCMP) &&
@@ -523,7 +526,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                         if (key->cipher == WLAN_CIPHER_SUITE_TKIP)
                                 key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC;
                         if (key->cipher == WLAN_CIPHER_SUITE_CCMP)
-                                key->flags |= IEEE80211_KEY_FLAG_SW_MGMT;
+                                key->flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX;
                         ret = 0;
                 }
                 break;
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 01c90ed58453..ab363f34b4df 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -1975,11 +1975,13 @@ ath5k_hw_set_spur_mitigation_filter(struct ath5k_hw *ah,
                         spur_delta_phase = (spur_offset << 18) / 25;
                         spur_freq_sigma_delta = (spur_delta_phase >> 10);
                         symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 2;
+                        break;
                 case AR5K_BWMODE_5MHZ:
                         /* Both sample_freq and chip_freq are 10MHz (?) */
                         spur_delta_phase = (spur_offset << 19) / 25;
                         spur_freq_sigma_delta = (spur_delta_phase >> 10);
                         symbol_width = AR5K_SPUR_SYMBOL_WIDTH_BASE_100Hz / 4;
+                        break;
                 default:
                         if (channel->band == IEEE80211_BAND_5GHZ) {
                                 /* Both sample_freq and chip_freq are 40MHz */