iwlwifi: fix iwl_mac_set_key and iwl3945_mac_set_key

This patch fix iwl_mac_set_key function changed in patch
"mac80211: clean up set_key callback"

1. removing 'static' const u8 *addr' that can possible cause
conflict when two or more NICs are present in the system.
2. simplifying functions

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index be14cd942a53..7e0baf6deedf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2998,12 +2998,10 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                            struct ieee80211_key_conf *key)
 {
         struct iwl_priv *priv = hw->priv;
-        int ret = 0;
-        u8 sta_id = IWL_INVALID_STATION;
-        u8 is_default_wep_key = 0;
-        static const u8 bcast_addr[ETH_ALEN] =
-                { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, };
-        static const u8 *addr;
+        const u8 *addr;
+        int ret;
+        u8 sta_id;
+        bool is_default_wep_key = false;
 
         IWL_DEBUG_MAC80211("enter\n");
 
@@ -3011,9 +3009,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                 IWL_DEBUG_MAC80211("leave - hwcrypto disabled\n");
                 return -EOPNOTSUPP;
         }
-
-        addr = sta ? sta->addr : bcast_addr;
-
+        addr = sta ? sta->addr : iwl_bcast_addr;
         sta_id = iwl_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
                 IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",