diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-12-06 10:47:12 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-06 10:47:12 -0500 |
| commit | d39aeaf260e7d1ec6a677beed230a0406d0069a6 (patch) | |
| tree | 1f5881fc037eaf55e83d56b09cfb194274419ce4 /net/mac80211/util.c | |
| parent | 40e4783ee62ac656a9a0fa3b512b6aee4f07d2d1 (diff) | |
| parent | d7a4858c0fde8383f7aa494eda0fba6bef3f2fec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 3b9b492e9403..5243c2cadeef 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1192,7 +1192,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)); } } @@ -1244,8 +1243,11 @@ int ieee80211_reconfig(struct ieee80211_local *local) changed |= BSS_CHANGED_IBSS; /* fall through */ case NL80211_IFTYPE_AP: - changed |= BSS_CHANGED_SSID | - BSS_CHANGED_AP_PROBE_RESP; + changed |= BSS_CHANGED_SSID; + + if (sdata->vif.type == NL80211_IFTYPE_AP) + changed |= BSS_CHANGED_AP_PROBE_RESP; + /* fall through */ case NL80211_IFTYPE_MESH_POINT: changed |= BSS_CHANGED_BEACON | |