From patchwork Sun Jan 17 21:45:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 73553 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0HLjxL9022557 for ; Sun, 17 Jan 2010 21:46:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755113Ab0AQVpu (ORCPT ); Sun, 17 Jan 2010 16:45:50 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755104Ab0AQVpt (ORCPT ); Sun, 17 Jan 2010 16:45:49 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:41056 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755103Ab0AQVpr (ORCPT ); Sun, 17 Jan 2010 16:45:47 -0500 Received: from smtp1-g21.free.fr (localhost [127.0.0.1]) by smtp1-g21.free.fr (Postfix) with ESMTP id 3BD14940145; Sun, 17 Jan 2010 22:45:40 +0100 (CET) Received: from benoit-laptop (ns.popipo.fr [88.163.232.53]) by smtp1-g21.free.fr (Postfix) with ESMTP id 5E4EE940131; Sun, 17 Jan 2010 22:45:38 +0100 (CET) Received: by benoit-laptop (Postfix, from userid 1000) id 3EB991DE0DC; Sun, 17 Jan 2010 22:45:38 +0100 (CET) From: Benoit Papillault To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Benoit Papillault Subject: [PATCH 2/2] mac80211: Fixed a bug in IBSS merge Date: Sun, 17 Jan 2010 22:45:24 +0100 Message-Id: <1263764724-14660-2-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1263764724-14660-1-git-send-email-benoit.papillault@free.fr> References: <1263764724-14660-1-git-send-email-benoit.papillault@free.fr> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index e0019f9..86bd2a0 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -355,12 +355,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 */