---

yaml --- r: 290384 b: refs/heads/master c: fd6415b h: refs/heads/master v: v3
git-mirror · Feb 6, 2012 · d9f888f · d9f888f
1 parent 27d01e2
commit d9f888f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d735f9213d11e34e6ed074acea30b6743b3385e6
+refs/heads/master: fd6415bcfb303e37052c72a3f44b7f81089d7336
diff --git a/trunk/drivers/net/wireless/iwlegacy/common.c b/trunk/drivers/net/wireless/iwlegacy/common.c
@@ -1950,7 +1950,7 @@ il_prep_station(struct il_priv *il, struct il_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 = ctx->station_flags;
+	station->sta.station_flags = 0;
 
 	if (sta) {
 		struct il_station_priv_common *sta_priv;

diff --git a/trunk/drivers/net/wireless/iwlegacy/common.h b/trunk/drivers/net/wireless/iwlegacy/common.h
@@ -1169,8 +1169,6 @@ struct il_rxon_context {
 
 	struct il_qos_info qos_data;
 
-	__le32 station_flags;
-
 	struct {
 		bool non_gf_sta_present;
 		u8 protection;