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>
This commit is contained in:
		
							parent
							
								
									137f9f46a4
								
							
						
					
					
						commit
						65f0e6a36e
					
				| @ -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 && | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user