diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index f3f6dba7a673..dbfee28107a5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -3021,13 +3021,17 @@ static void iwl_mac_update_tkip_key(struct ieee80211_hw *hw, | |||
3021 | } | 3021 | } |
3022 | 3022 | ||
3023 | static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | 3023 | static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, |
3024 | const u8 *local_addr, const u8 *addr, | 3024 | struct ieee80211_vif *vif, |
3025 | struct ieee80211_sta *sta, | ||
3025 | struct ieee80211_key_conf *key) | 3026 | struct ieee80211_key_conf *key) |
3026 | { | 3027 | { |
3027 | struct iwl_priv *priv = hw->priv; | 3028 | struct iwl_priv *priv = hw->priv; |
3028 | int ret = 0; | 3029 | int ret = 0; |
3029 | u8 sta_id = IWL_INVALID_STATION; | 3030 | u8 sta_id = IWL_INVALID_STATION; |
3030 | u8 is_default_wep_key = 0; | 3031 | u8 is_default_wep_key = 0; |
3032 | static const u8 bcast_addr[ETH_ALEN] = | ||
3033 | { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }; | ||
3034 | static const u8 *addr; | ||
3031 | 3035 | ||
3032 | IWL_DEBUG_MAC80211("enter\n"); | 3036 | IWL_DEBUG_MAC80211("enter\n"); |
3033 | 3037 | ||
@@ -3036,9 +3040,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
3036 | return -EOPNOTSUPP; | 3040 | return -EOPNOTSUPP; |
3037 | } | 3041 | } |
3038 | 3042 | ||
3039 | if (is_zero_ether_addr(addr)) | 3043 | addr = sta ? sta->addr : bcast_addr; |
3040 | /* only support pairwise keys */ | ||
3041 | return -EOPNOTSUPP; | ||
3042 | 3044 | ||
3043 | sta_id = iwl_find_station(priv, addr); | 3045 | sta_id = iwl_find_station(priv, addr); |
3044 | if (sta_id == IWL_INVALID_STATION) { | 3046 | if (sta_id == IWL_INVALID_STATION) { |