From a08de915f4d9c68a004b46038bfcb663ec3443bd Mon Sep 17 00:00:00 2001 From: Mohammed Shafi Shajakhan Date: Sat, 7 Jan 2012 21:06:21 +0530 Subject: [PATCH] --- yaml --- r: 289938 b: refs/heads/master c: 39d02a7d90602d4557ee05db2a157a4e0ec3a3d3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/ibss.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c259949f7a2a..11dd0bdbf5af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb4961dbc27d40cdbed297aa9bd74fa4a0e2ba6c +refs/heads/master: 39d02a7d90602d4557ee05db2a157a4e0ec3a3d3 diff --git a/trunk/net/mac80211/ibss.c b/trunk/net/mac80211/ibss.c index b3d76b756cd5..b4c30318e22b 100644 --- a/trunk/net/mac80211/ibss.c +++ b/trunk/net/mac80211/ibss.c @@ -642,8 +642,7 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) "IBSS networks with same SSID (merge)\n", sdata->name); ieee80211_request_internal_scan(sdata, - ifibss->ssid, ifibss->ssid_len, - ifibss->fixed_channel ? ifibss->channel : NULL); + ifibss->ssid, ifibss->ssid_len, NULL); } static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata)