aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index a176f42fd7cf..43cfc6ec5163 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6546,12 +6546,16 @@ out_unlock:
6546} 6546}
6547 6547
6548static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 6548static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
6549 const u8 *local_addr, const u8 *addr, 6549 struct ieee80211_vif *vif,
6550 struct ieee80211_key_conf *key) 6550 struct ieee80211_sta *sta,
6551 struct ieee80211_key_conf *key)
6551{ 6552{
6552 struct iwl_priv *priv = hw->priv; 6553 struct iwl_priv *priv = hw->priv;
6554 const u8 *addr;
6553 int rc = 0; 6555 int rc = 0;
6554 u8 sta_id; 6556 u8 sta_id;
6557 static const u8 bcast_addr[ETH_ALEN] =
6558 { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
6555 6559
6556 IWL_DEBUG_MAC80211("enter\n"); 6560 IWL_DEBUG_MAC80211("enter\n");
6557 6561
@@ -6560,9 +6564,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
6560 return -EOPNOTSUPP; 6564 return -EOPNOTSUPP;
6561 } 6565 }
6562 6566
6563 if (is_zero_ether_addr(addr)) 6567 addr = sta ? sta->addr : bcast_addr;
6564 /* only support pairwise keys */
6565 return -EOPNOTSUPP;
6566 6568
6567 sta_id = iwl3945_hw_find_station(priv, addr); 6569 sta_id = iwl3945_hw_find_station(priv, addr);
6568 if (sta_id == IWL_INVALID_STATION) { 6570 if (sta_id == IWL_INVALID_STATION) {