diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-24 20:34:40 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-24 20:34:40 +0200 |
| commit | 9b4e9e756541fd5d1223b323ed5a8a8545dd11cd (patch) | |
| tree | 3eed3a2582532bd1fd890b58eadd472fcd2b1dc7 /drivers/net/wireless/ath/ath9k/htc_drv_main.c | |
| parent | rtlwifi: Remove EXPERIMENTAL as pre-requisite for the drivers (diff) | |
| parent | mac80211: allow re-open the blocked peer link in mesh (diff) | |
| download | linux-9b4e9e756541fd5d1223b323ed5a8a8545dd11cd.tar.xz linux-9b4e9e756541fd5d1223b323ed5a8a8545dd11cd.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/htc_drv_main.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/drivers/net/wireless/ath/ath9k/htc_drv_main.c index 61d096e3596f..ca78e33ca23e 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c @@ -1445,7 +1445,7 @@ static int ath9k_htc_set_key(struct ieee80211_hw *hw, key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; if (priv->ah->sw_mgmt_crypto && key->cipher == WLAN_CIPHER_SUITE_CCMP) - key->flags |= IEEE80211_KEY_FLAG_SW_MGMT; + key->flags |= IEEE80211_KEY_FLAG_SW_MGMT_TX; ret = 0; } break; |