summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-sta.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-08-23 10:46:44 +0200
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2010-08-27 09:26:28 -0700
commit770e13bdda27065e31b3ab4daa3a04b6429719a1 (patch)
treed10352c856937c9fbb13470d74b8fe33de360be1 /drivers/net/wireless/iwlwifi/iwl-sta.c
parentc10afb6e844b7936092396f719b794c4d0038f27 (diff)
downloadlinux-stable-770e13bdda27065e31b3ab4daa3a04b6429719a1.tar.gz
linux-stable-770e13bdda27065e31b3ab4daa3a04b6429719a1.tar.bz2
linux-stable-770e13bdda27065e31b3ab4daa3a04b6429719a1.zip
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/wireless/iwlwifi/iwl-sta.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-sta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index ac6e2be35284..e6bb81b1514c 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,
memcpy(station->sta.sta.addr, addr, ETH_ALEN);
station->sta.mode = 0;
station->sta.sta.sta_id = sta_id;
- station->sta.station_flags = 0;
+ station->sta.station_flags = ctx->station_flags;
station->ctxid = ctx->ctxid;
/*