diff options
author | David S. Miller <davem@davemloft.net> | 2011-12-05 19:23:14 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-05 19:23:14 +0100 |
commit | 321f3b8708e853695a4ff4a1a95b6fa0965b06e5 (patch) | |
tree | 0fd46721f5620710b079109b31a458573c1b3902 /net/mac80211/util.c | |
parent | ipv4: Fix peer validation on cached lookup. (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
download | linux-321f3b8708e853695a4ff4a1a95b6fa0965b06e5.tar.xz linux-321f3b8708e853695a4ff4a1a95b6fa0965b06e5.zip |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index eca0fad09709..d5230ecc784d 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1039,7 +1039,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)); } } |