From patchwork Wed Jan 25 17:52:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Cavallari X-Patchwork-Id: 137810 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 38AD2B6F9A for ; Thu, 26 Jan 2012 04:53:09 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id C9C7817C036; Wed, 25 Jan 2012 12:53:06 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id p6dUWFb686E6; Wed, 25 Jan 2012 12:53:06 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 023AB17C038; Wed, 25 Jan 2012 12:52:52 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 4CDFA17C038 for ; Wed, 25 Jan 2012 12:52:50 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sgGL67BUgjEN for ; Wed, 25 Jan 2012 12:52:45 -0500 (EST) Received: from smtp1.u-psud.fr (smtp1.u-psud.fr [129.175.33.41]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id E219517C030 for ; Wed, 25 Jan 2012 12:52:44 -0500 (EST) Received: from smtp1.u-psud.fr (localhost [127.0.0.1]) by localhost (MTA) with SMTP id 7CD7A256230 for ; Wed, 25 Jan 2012 18:52:44 +0100 (CET) Received: from ext.lri.fr (ext.lri.fr [129.175.15.4]) by smtp1.u-psud.fr (MTA) with ESMTP id 66FD425622A for ; Wed, 25 Jan 2012 18:52:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ext.lri.fr (Postfix) with ESMTP id 692A440617 for ; Wed, 25 Jan 2012 18:52:44 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at lri.fr Received: from ext.lri.fr ([127.0.0.1]) by localhost (ext.lri.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VUQp2yeVIYGK for ; Wed, 25 Jan 2012 18:52:44 +0100 (CET) Received: from smtp-ng.lri.fr (smtp [129.175.3.73]) by ext.lri.fr (Postfix) with ESMTP id 4CB9140166 for ; Wed, 25 Jan 2012 18:52:44 +0100 (CET) Received: from lowerbit.lri.fr (lri25-36 [129.175.25.36]) by smtp-ng.lri.fr (Postfix) with ESMTP id 46FFC60781; Wed, 25 Jan 2012 18:52:44 +0100 (CET) From: Nicolas Cavallari To: hostap@lists.shmoo.com Subject: [RFC 2/2] Add IBSS BSSID fixing support to nl80211 driver. Date: Wed, 25 Jan 2012 18:52:35 +0100 Message-Id: <1327513955-9992-2-git-send-email-cavallar@lri.fr> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1327513955-9992-1-git-send-email-cavallar@lri.fr> References: <1327513955-9992-1-git-send-email-cavallar@lri.fr> Cc: Nicolas Cavallari X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com If a BSSID and fixed-bssid are requested, fix the BSSID, so the driver does not attempt to merge. Signed-hostap: Nicolas Cavallari --- Specifying an BSSID is enought for the kernel to fix the BSSID, according to the doc. The latest Linux kernel have somewhat broken fixed_bssid behaviour and i'm preparing a patch for that. src/drivers/driver_nl80211.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 82f5664..fec1d5f 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -6398,6 +6398,12 @@ retry: if (ret) goto nla_put_failure; + if (params->bssid && params->fixed_bssid) { + wpa_printf(MSG_DEBUG, " * BSSID=" MACSTR, + MAC2STR(params->bssid)); + NLA_PUT(msg, NL80211_ATTR_MAC, 6, params->bssid); + } + if (params->wpa_ie) { wpa_hexdump(MSG_DEBUG, " * Extra IEs for Beacon/Probe Response frames",