lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Browse Source
This commit is contained in:
John W. Linville
2011-05-24 16:47:54 -04:00
parent 557eed6031 daf8cf608d
commit 31ec97d9ce
143 changed files with 1820 additions and 975 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/mac80211/iface.c
View File

@@ -384,11 +384,11 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
int i;
enum nl80211_channel_type orig_ct;
clear_bit(SDATA_STATE_RUNNING, &sdata->state);
if (local->scan_sdata == sdata)
ieee80211_scan_cancel(local);
clear_bit(SDATA_STATE_RUNNING, &sdata->state);
/*
* Stop TX on this interface first.
*/