diff options
| author | Alina Friedrichsen <x-alina@gmx.net> | 2009-01-06 03:08:10 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-01-29 15:59:49 -0500 |
| commit | 65f0e6a36e25fbfa6adf706d9c53bf64b13096eb (patch) | |
| tree | f4d8da7c2f6b0338a3c433425a7a2c976db45e75 /net/mac80211/mlme.c | |
| parent | 137f9f46a4edf8a937ffe9e3dba498b5cfaa1e5b (diff) | |
| download | op-kernel-dev-65f0e6a36e25fbfa6adf706d9c53bf64b13096eb.zip op-kernel-dev-65f0e6a36e25fbfa6adf706d9c53bf64b13096eb.tar.gz | |
mac80211: Don't merge if BSSID is set manually
If you set a fixed BSSID manually, you never want that the driver
change it back, or your ad-hoc mesh network will break into peaces. So
don't do it.
Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 563ceb4..2db5660 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1644,6 +1644,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, /* check if we need to merge IBSS */ if (sdata->vif.type == NL80211_IFTYPE_ADHOC && beacon && + (!(sdata->u.sta.flags & IEEE80211_STA_BSSID_SET)) && bss->capability & WLAN_CAPABILITY_IBSS && bss->freq == local->oper_channel->center_freq && elems->ssid_len == sdata->u.sta.ssid_len && |
