From patchwork Mon Feb 18 20:30:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dvdspndl@gmail.com X-Patchwork-Id: 221485 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]) by ozlabs.org (Postfix) with ESMTP id CA55F2C008C for ; Tue, 19 Feb 2013 07:31:40 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 9A6569D339; Mon, 18 Feb 2013 15:31:34 -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 Pi9gtGWVp51m; Mon, 18 Feb 2013 15:31:34 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 94C6D9D33A; Mon, 18 Feb 2013 15:30:54 -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 E7C4C9D30D for ; Mon, 18 Feb 2013 15:30:51 -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 Riyvx6dybiFg for ; Mon, 18 Feb 2013 15:30:48 -0500 (EST) Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com [209.85.215.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id 08DC99D22D for ; Mon, 18 Feb 2013 15:30:47 -0500 (EST) Received: by mail-ea0-f180.google.com with SMTP id c1so2442383eaa.25 for ; Mon, 18 Feb 2013 12:30:47 -0800 (PST) X-Received: by 10.14.201.5 with SMTP id a5mr48683675eeo.17.1361219446963; Mon, 18 Feb 2013 12:30:46 -0800 (PST) Received: from localhost (93-172-163-212.bb.netvision.net.il. [93.172.163.212]) by mx.google.com with ESMTPS id q42sm91165859eem.14.2013.02.18.12.30.45 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 Feb 2013 12:30:46 -0800 (PST) From: dvdspndl@gmail.com To: hostap@lists.shmoo.com Subject: [PATCH 04/10] nl80211_driver: rename is_p2p_interface Date: Mon, 18 Feb 2013 22:30:30 +0200 Message-Id: <1361219436-5840-4-git-send-email-dvdspndl@gmail.com> X-Mailer: git-send-email 1.7.10.msysgit.1 In-Reply-To: <1361219436-5840-1-git-send-email-dvdspndl@gmail.com> References: <1361219436-5840-1-git-send-email-dvdspndl@gmail.com> 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 From: David Spinadel Rename is_p2p_interaface() to is_p2p_net_interface() since it used to identify network P2P interfaces to disable 11b rates on them. Signed-off-by: David Spinadel --- src/drivers/driver_nl80211.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index e2925c2..5bb2181 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -359,7 +359,7 @@ static int is_sta_interface(enum nl80211_iftype nlmode) } -static int is_p2p_interface(enum nl80211_iftype nlmode) +static int is_p2p_net_interface(enum nl80211_iftype nlmode) { return (nlmode == NL80211_IFTYPE_P2P_CLIENT || nlmode == NL80211_IFTYPE_P2P_GO); @@ -6038,7 +6038,7 @@ static int nl80211_create_iface(struct wpa_driver_nl80211_data *drv, wds); } - if (ret >= 0 && is_p2p_interface(iftype)) + if (ret >= 0 && is_p2p_net_interface(iftype)) nl80211_disable_11b_rates(drv, ret, 1); return ret; @@ -7336,7 +7336,7 @@ done: return ret; } - if (is_p2p_interface(nlmode)) + if (is_p2p_net_interface(nlmode)) nl80211_disable_11b_rates(drv, drv->ifindex, 1); else if (drv->disabled_11b_rates) nl80211_disable_11b_rates(drv, drv->ifindex, 0);