Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts: drivers/bluetooth/ath3k.c drivers/bluetooth/btusb.c
This commit is contained in:
@@ -1204,7 +1204,9 @@ int ieee80211_reconfig(struct ieee80211_local *local)
|
||||
switch (sdata->vif.type) {
|
||||
case NL80211_IFTYPE_STATION:
|
||||
changed |= BSS_CHANGED_ASSOC;
|
||||
mutex_lock(&sdata->u.mgd.mtx);
|
||||
ieee80211_bss_info_change_notify(sdata, changed);
|
||||
mutex_unlock(&sdata->u.mgd.mtx);
|
||||
break;
|
||||
case NL80211_IFTYPE_ADHOC:
|
||||
changed |= BSS_CHANGED_IBSS;
|
||||
|
Reference in New Issue
Block a user