diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2010-04-30 13:53:37 -0700 |
|---|---|---|
| committer |   Reinette Chatre <reinette.chatre@intel.com> | 2010-05-10 15:09:06 -0700 |
| commit | bdbb612fb2c49111d393a69a08b0328e51913c17 (patch) | |
| tree | ec86ab9c1dccdaf11e17e1dc236d030581850e75 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | iwlagn: use iwl_sta_id() for aggregation (diff) | |
| download | linux-dev-bdbb612fb2c49111d393a69a08b0328e51913c17.tar.xz linux-dev-bdbb612fb2c49111d393a69a08b0328e51913c17.zip | |
iwlwifi: use iwl_sta_id() for TKIP key update
With the station ID being stored in the
station struct, which mac80211 gives us
for TKIP phase 1 key updates, we can also
remove the use of iwl_find_station() in
that code path.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 3265b637db2e..dd26965e75f3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -3057,8 +3057,7 @@ static void iwl_mac_update_tkip_key(struct ieee80211_hw *hw, struct iwl_priv *priv = hw->priv; IWL_DEBUG_MAC80211(priv, "enter\n"); - iwl_update_tkip_key(priv, keyconf, - sta ? sta->addr : iwl_bcast_addr, + iwl_update_tkip_key(priv, keyconf, sta, iv32, phase1key); IWL_DEBUG_MAC80211(priv, "leave\n"); |