aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-12-01 10:44:17 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-01 10:44:17 -0500
commit03360c5a405999d605ffc7373a7b90f3388db92e (patch)
tree540707c796bd83ee1ef52cc37843c522f1bc4808 /net
parentc72e8d335e2c6a309b6281f2abcf491f37b8b92b (diff)
Revert "mac80211: clear sta.drv_priv on reconfiguration"
This reverts commit f785d83a19bca326f79d127a413e35769afc0105. This was provoking WARNINGs from the iwlegacy drivers. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/util.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 0c9490722aa5..6719bce4a081 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -1038,7 +1038,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
1038 struct ieee80211_sub_if_data, 1038 struct ieee80211_sub_if_data,
1039 u.ap); 1039 u.ap);
1040 1040
1041 memset(&sta->sta.drv_priv, 0, hw->sta_data_size);
1042 WARN_ON(drv_sta_add(local, sdata, &sta->sta)); 1041 WARN_ON(drv_sta_add(local, sdata, &sta->sta));
1043 } 1042 }
1044 } 1043 }