diff options
Diffstat (limited to 'drivers/net/wireless/iwlegacy/3945-mac.c')
-rw-r--r-- | drivers/net/wireless/iwlegacy/3945-mac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c index 8072ae8b0ce8..b11701f58741 100644 --- a/drivers/net/wireless/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/iwlegacy/3945-mac.c | |||
@@ -140,7 +140,7 @@ il3945_set_ccmp_dynamic_key_info(struct il_priv *il, | |||
140 | key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK); | 140 | key_flags |= (STA_KEY_FLG_CCMP | STA_KEY_FLG_MAP_KEY_MSK); |
141 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); | 141 | key_flags |= cpu_to_le16(keyconf->keyidx << STA_KEY_FLG_KEYID_POS); |
142 | 142 | ||
143 | if (sta_id == il->ctx.bcast_sta_id) | 143 | if (sta_id == il->hw_params.bcast_id) |
144 | key_flags |= STA_KEY_MULTICAST_MSK; | 144 | key_flags |= STA_KEY_MULTICAST_MSK; |
145 | 145 | ||
146 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; | 146 | keyconf->flags |= IEEE80211_KEY_FLAG_GENERATE_IV; |
@@ -2598,7 +2598,7 @@ il3945_request_scan(struct il_priv *il, struct ieee80211_vif *vif) | |||
2598 | /* We don't build a direct scan probe request; the uCode will do | 2598 | /* We don't build a direct scan probe request; the uCode will do |
2599 | * that based on the direct_mask added to each channel entry */ | 2599 | * that based on the direct_mask added to each channel entry */ |
2600 | scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK; | 2600 | scan->tx_cmd.tx_flags = TX_CMD_FLG_SEQ_CTL_MSK; |
2601 | scan->tx_cmd.sta_id = il->ctx.bcast_sta_id; | 2601 | scan->tx_cmd.sta_id = il->hw_params.bcast_id; |
2602 | scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; | 2602 | scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE; |
2603 | 2603 | ||
2604 | /* flags + rate selection */ | 2604 | /* flags + rate selection */ |