diff options
author | Johannes Berg <johannes.berg@intel.com> | 2010-08-23 04:46:42 -0400 |
---|---|---|
committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-08-27 12:25:31 -0400 |
commit | 2995bafafd4d9d2f840b51b0121997be09fb8b47 (patch) | |
tree | 1e25d3888e0489687c2dbbbdc731ec0a147d6319 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 95c38dd429712366739299579b0785625cba66d6 (diff) |
iwlwifi: move AP sta ID to context
Each context needs to use a different AP sta
ID, so we need to move that into the context
struct instead of hardcoding it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@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, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 5e1df24bdb5..a67b04b309e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -3585,7 +3585,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
3585 | switch (cmd) { | 3585 | switch (cmd) { |
3586 | case SET_KEY: | 3586 | case SET_KEY: |
3587 | if (is_default_wep_key) | 3587 | if (is_default_wep_key) |
3588 | ret = iwl_set_default_wep_key(priv, key); | 3588 | ret = iwl_set_default_wep_key(priv, vif_priv->ctx, key); |
3589 | else | 3589 | else |
3590 | ret = iwl_set_dynamic_key(priv, vif_priv->ctx, | 3590 | ret = iwl_set_dynamic_key(priv, vif_priv->ctx, |
3591 | key, sta_id); | 3591 | key, sta_id); |
@@ -4208,6 +4208,7 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
4208 | priv->contexts[IWL_RXON_CTX_BSS].rxon_timing_cmd = REPLY_RXON_TIMING; | 4208 | priv->contexts[IWL_RXON_CTX_BSS].rxon_timing_cmd = REPLY_RXON_TIMING; |
4209 | priv->contexts[IWL_RXON_CTX_BSS].rxon_assoc_cmd = REPLY_RXON_ASSOC; | 4209 | priv->contexts[IWL_RXON_CTX_BSS].rxon_assoc_cmd = REPLY_RXON_ASSOC; |
4210 | priv->contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM; | 4210 | priv->contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM; |
4211 | priv->contexts[IWL_RXON_CTX_BSS].ap_sta_id = IWL_AP_ID; | ||
4211 | BUILD_BUG_ON(NUM_IWL_RXON_CTX != 1); | 4212 | BUILD_BUG_ON(NUM_IWL_RXON_CTX != 1); |
4212 | 4213 | ||
4213 | SET_IEEE80211_DEV(hw, &pdev->dev); | 4214 | SET_IEEE80211_DEV(hw, &pdev->dev); |