Commit 2e10d330 authored Dec 20, 2009 by Felix Fietkau Committed by John W. Linville Dec 28, 2009

mac80211: fix ibss join with fixed-bssid



When fixed bssid is requested when joining an ibss network, incoming
beacons that match the configured bssid cause mac80211 to create new
sta entries, even before the ibss interface is in joined state.
When that happens, it fails to bring up the interface entirely, because
it checks for existing sta entries before joining.
This patch fixes this bug by refusing to create sta info entries before
the interface is fully operational.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 659c8e52

net/mac80211/ibss.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -382,6 +382,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
		struct sta_info ieee80211_ibss_add_sta(struct ieee80211_sub_if_data sdata,
		u8 bssid,u8 addr, u32 supp_rates)
		{
		struct ieee80211_if_ibss *ifibss = &sdata->u.ibss;
		struct ieee80211_local *local = sdata->local;
		struct sta_info *sta;
		int band = local->hw.conf.channel->band;
		@@ -397,6 +398,9 @@ struct sta_info ieee80211_ibss_add_sta(struct ieee80211_sub_if_data sdata,
		return NULL;
		}

		if (ifibss->state == IEEE80211_IBSS_MLME_SEARCH)
		return NULL;

		if (compare_ether_addr(bssid, sdata->u.ibss.bssid))
		return NULL;

Admin message