Commit a98bfec2 authored by Benoit Papillault's avatar Benoit Papillault Committed by John W. Linville

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: default avatarBenoit Papillault <>
Signed-off-by: default avatarJohn W. Linville <>
parent ce9058ae
......@@ -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 */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment