diff options
| author | Benoit Papillault <benoit.papillault@free.fr> | 2010-01-17 22:45:24 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 16:43:10 -0500 |
| commit | a98bfec2985221d8e0904a526cbe88590eaad2a6 (patch) | |
| tree | 62f44c77e246e3bd1173cb1c79eeadc62e3cb2d1 /net/mac80211/ibss.c | |
| parent | ce9058aedd75f14785400dcc49a2bc352ca38871 (diff) | |
| download | linux-a98bfec2985221d8e0904a526cbe88590eaad2a6.tar.gz linux-a98bfec2985221d8e0904a526cbe88590eaad2a6.tar.bz2 linux-a98bfec2985221d8e0904a526cbe88590eaad2a6.zip | |
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>
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index c2a708e3a18c..f95750b423e3 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -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 */ |