diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-05-16 14:55:42 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-16 19:32:19 -0400 |
| commit | e00cf3b9eb7839b952e434a75bff6b99e47337ac (patch) | |
| tree | ef583ab8ac09bf703026650d4bc7777e6a3864d3 /net/mac80211/iface.c | |
| parent | 1a8218e96271790a07dd7065a2ef173e0f67e328 (diff) | |
| parent | 3b8ab88acaceb505aa06ef3bbf3a73b92470ae78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
net/mac80211/sta_info.h
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 80c29d626aa4..7dfbe71dc637 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -449,7 +449,8 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, | |||
| 449 | /* APs need special treatment */ | 449 | /* APs need special treatment */ |
| 450 | if (sdata->vif.type == NL80211_IFTYPE_AP) { | 450 | if (sdata->vif.type == NL80211_IFTYPE_AP) { |
| 451 | struct ieee80211_sub_if_data *vlan, *tmpsdata; | 451 | struct ieee80211_sub_if_data *vlan, *tmpsdata; |
| 452 | struct beacon_data *old_beacon = sdata->u.ap.beacon; | 452 | struct beacon_data *old_beacon = |
| 453 | rtnl_dereference(sdata->u.ap.beacon); | ||
| 453 | 454 | ||
| 454 | /* sdata_running will return false, so this will disable */ | 455 | /* sdata_running will return false, so this will disable */ |
| 455 | ieee80211_bss_info_change_notify(sdata, | 456 | ieee80211_bss_info_change_notify(sdata, |