From patchwork Sun Mar 17 20:57:14 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: 228323 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 DA5A72C00AD for ; Mon, 18 Mar 2013 07:58:35 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 06ADB9C202; Sun, 17 Mar 2013 16:58:34 -0400 (EDT) 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 BHUFbReEATuV; Sun, 17 Mar 2013 16:58:33 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 415EF9C194; Sun, 17 Mar 2013 16:57:56 -0400 (EDT) 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 C44069C171 for ; Sun, 17 Mar 2013 16:57:54 -0400 (EDT) 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 LY2czFaFfbXA for ; Sun, 17 Mar 2013 16:57:51 -0400 (EDT) Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) (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 F0DEF9C197 for ; Sun, 17 Mar 2013 16:57:34 -0400 (EDT) Received: by mail-ea0-f182.google.com with SMTP id q15so2213383ead.27 for ; Sun, 17 Mar 2013 13:57:34 -0700 (PDT) X-Received: by 10.14.220.135 with SMTP id o7mr42392687eep.3.1363553853948; Sun, 17 Mar 2013 13:57:33 -0700 (PDT) Received: from localhost (46-116-160-72.bb.netvision.net.il. [46.116.160.72]) by mx.google.com with ESMTPS id 46sm23408215eea.3.2013.03.17.13.57.32 (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 17 Mar 2013 13:57:33 -0700 (PDT) From: David Spinadel To: hostap@lists.shmoo.com Subject: [PATCH v2 04/10] nl80211_driver: rename is_p2p_interface Date: Sun, 17 Mar 2013 22:57:14 +0200 Message-Id: <1363553840-7844-5-git-send-email-dvdspndl@gmail.com> X-Mailer: git-send-email 1.7.10.msysgit.1 In-Reply-To: <1363553840-7844-1-git-send-email-dvdspndl@gmail.com> References: <1363553840-7844-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 cf15603..d37ab7f 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -361,7 +361,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); @@ -6274,7 +6274,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; @@ -7561,7 +7561,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);