From 31b7cb1d1deb3c8399ac168b74bf41cf42f85f83 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Thu, 1 Dec 2011 10:44:17 -0500
Subject: [PATCH] --- yaml --- r: 276431 b: refs/heads/master c:
 03360c5a405999d605ffc7373a7b90f3388db92e h: refs/heads/master i:   276429:
 77fefb8ec38e371c21479eb39841de5c4d36aa1b   276427:
 e3605f76f47be82ae0ebd4b50b852035b7b2e513   276423:
 41cfa68edce3f27b0152e18361d6617cd473d467   276415:
 7d77c6e3e5f46ccb84eb0bea15318c5bcbd75c2b v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/util.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9b1157873ad8..04e9c94660dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c72e8d335e2c6a309b6281f2abcf491f37b8b92b
+refs/heads/master: 03360c5a405999d605ffc7373a7b90f3388db92e
diff --git a/trunk/net/mac80211/util.c b/trunk/net/mac80211/util.c
index 0c9490722aa5..6719bce4a081 100644
--- a/trunk/net/mac80211/util.c
+++ b/trunk/net/mac80211/util.c
@@ -1038,7 +1038,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
 					     struct ieee80211_sub_if_data,
 					     u.ap);
 
-			memset(&sta->sta.drv_priv, 0, hw->sta_data_size);
 			WARN_ON(drv_sta_add(local, sdata, &sta->sta));
 		}
 	}