openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mac80211: Fixed a bug in IBSS merge 

First, both beacons and probe responses can be used for IBSS merge.
Next, sdata->u.ibss.bssid was always true (and thus IBSS merge was
disabled). We should use sdata->u.ibss.fixed_bssid instead.

Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Benoit Papillault 2010-01-17 22:45:24 +01:00 committed by John W. Linville
parent ce9058aedd
commit a98bfec298
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/ibss.c
View File

@ -293,12 +293,8 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
/* check if we need to merge IBSS */
/* merge only on beacons (???) */
if (!beacon)
goto put_bss;
/* we use a fixed BSSID */
if (sdata->u.ibss.bssid)
if (sdata->u.ibss.fixed_bssid)
goto put_bss;
/* not an IBSS */