raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 18:09:56 +00:00
Code Issues Projects Releases Wiki Activity

cfg80211: call disconnect_wk when AP stops

Browse Source 
commit e005bd7dde upstream.

Since we now prevent regulatory restore during STA disconnect
if concurrent AP interfaces are active, we need to reschedule
this check when the AP state changes. This fixes never doing
a restore when an AP is the last interface to stop. Or to put
it another way: we need to re-check after anything we check
here changes.

Cc: stable@vger.kernel.org
Fixes: 113f3aaa81 ("cfg80211: Prevent regulatory restore during STA disconnect in concurrent interfaces")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johannes Berg
2019-02-01 11:09:54 +01:00
committed by Greg Kroah-Hartman
parent 860f8e10ce
commit a63bbec71a
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/wireless/ap.c
View File

@@ -41,6 +41,8 @@ int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev,
cfg80211_sched_dfs_chan_update(rdev); cfg80211_sched_dfs_chan_update(rdev);
} }
schedule_work(&cfg80211_disconnect_work);
return err; return err;
} }

2
net/wireless/core.h
View File

@@ -444,6 +444,8 @@ void cfg80211_process_wdev_events(struct wireless_dev *wdev);
bool cfg80211_does_bw_fit_range(const struct ieee80211_freq_range *freq_range, bool cfg80211_does_bw_fit_range(const struct ieee80211_freq_range *freq_range,
u32 center_freq_khz, u32 bw_khz); u32 center_freq_khz, u32 bw_khz);
extern struct work_struct cfg80211_disconnect_work;
/** /**
* cfg80211_chandef_dfs_usable - checks if chandef is DFS usable * cfg80211_chandef_dfs_usable - checks if chandef is DFS usable
* @wiphy: the wiphy to validate against * @wiphy: the wiphy to validate against

2
net/wireless/sme.c
View File

@@ -667,7 +667,7 @@ static void disconnect_work(struct work_struct *work)
rtnl_unlock(); rtnl_unlock();
} }
static DECLARE_WORK(cfg80211_disconnect_work, disconnect_work); DECLARE_WORK(cfg80211_disconnect_work, disconnect_work);
/* /*