aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-23 04:46:44 -0400
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-08-27 12:26:28 -0400
commit770e13bdda27065e31b3ab4daa3a04b6429719a1 (patch)
treed10352c856937c9fbb13470d74b8fe33de360be1 /drivers/net
parentc10afb6e844b7936092396f719b794c4d0038f27 (diff)
iwlwifi: store default station flags in context
Since the default context is initialised to zero, and the default flags are zero, no more code is needed to initialise them right now, but another context can have different default flags. 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')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-sta.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index ef7862b5e91..2f9d1daff55 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -1137,6 +1137,8 @@ struct iwl_rxon_context {
1137 1137
1138 struct iwl_wep_key wep_keys[WEP_KEYS_MAX]; 1138 struct iwl_wep_key wep_keys[WEP_KEYS_MAX];
1139 u8 key_mapping_keys; 1139 u8 key_mapping_keys;
1140
1141 __le32 station_flags;
1140}; 1142};
1141 1143
1142struct iwl_priv { 1144struct iwl_priv {
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index ac6e2be3528..e6bb81b1514 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -289,7 +289,7 @@ static u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,
289 memcpy(station->sta.sta.addr, addr, ETH_ALEN); 289 memcpy(station->sta.sta.addr, addr, ETH_ALEN);
290 station->sta.mode = 0; 290 station->sta.mode = 0;
291 station->sta.sta.sta_id = sta_id; 291 station->sta.sta.sta_id = sta_id;
292 station->sta.station_flags = 0; 292 station->sta.station_flags = ctx->station_flags;
293 station->ctxid = ctx->ctxid; 293 station->ctxid = ctx->ctxid;
294 294
295 /* 295 /*