From patchwork Sun Feb 14 23:33:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 79334 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1ENY9DJ030576 for ; Sun, 14 Feb 2010 23:34:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753450Ab0BNXeI (ORCPT ); Sun, 14 Feb 2010 18:34:08 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:40322 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752882Ab0BNXeE (ORCPT ); Sun, 14 Feb 2010 18:34:04 -0500 Received: from smtp1-g21.free.fr (localhost [127.0.0.1]) by smtp1-g21.free.fr (Postfix) with ESMTP id 50FFA9400C2; Mon, 15 Feb 2010 00:33:57 +0100 (CET) Received: from xian.sabine-et-benoit.com (ns.popipo.fr [88.163.232.53]) by smtp1-g21.free.fr (Postfix) with ESMTP id 2E5839400D9; Mon, 15 Feb 2010 00:33:55 +0100 (CET) Received: by xian.sabine-et-benoit.com (Postfix, from userid 1000) id 13DF0701A3; Mon, 15 Feb 2010 00:33:55 +0100 (CET) From: Benoit Papillault To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Benoit Papillault Subject: [PATCH 2/2] mac80211: Improved IBSS merges even if BSSID is the same Date: Mon, 15 Feb 2010 00:33:55 +0100 Message-Id: <1266190435-2355-2-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1266190435-2355-1-git-send-email-benoit.papillault@free.fr> References: <1266190435-2355-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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 14 Feb 2010 23:34:09 +0000 (UTC) diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 9328395..5f343ed 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -372,10 +372,6 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, sdata->u.ibss.ssid_len)) goto put_bss; - /* same BSSID */ - if (memcmp(cbss->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) - goto put_bss; - if (rx_status->flag & RX_FLAG_TSFT) { /* * For correct IBSS merging we need mactime; since mactime is