From patchwork Sun Nov 27 19:08:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sabrina Dubroca X-Patchwork-Id: 699742 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tRfYp6MXdz9t0J for ; Mon, 28 Nov 2016 06:11:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cB4rJ-0004S5-PV; Sun, 27 Nov 2016 19:11:29 +0000 Received: from relay2-d.mail.gandi.net ([2001:4b98:c:538::194]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cB4rF-0004Bs-T0 for hostap@lists.infradead.org; Sun, 27 Nov 2016 19:11:27 +0000 Received: from mfilter20-d.gandi.net (mfilter20-d.gandi.net [217.70.178.148]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id 93A3FC5A54; Sun, 27 Nov 2016 20:11:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter20-d.gandi.net X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter20-d.gandi.net (mfilter20-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id BtYTUEZ3Jfav; Sun, 27 Nov 2016 20:10:32 +0100 (CET) X-Originating-IP: 217.192.177.51 Received: from localhost (unknown [217.192.177.51]) (Authenticated sender: sd@queasysnail.net) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id C5616C5A53; Sun, 27 Nov 2016 20:10:32 +0100 (CET) From: Sabrina Dubroca To: hostap@lists.infradead.org Subject: [PATCH 09/13] drivers: move driver_wired_get_capa to a common file Date: Sun, 27 Nov 2016 20:08:52 +0100 Message-Id: <2bf8b18183bd106a3a3f8c62e847f0f37dce555f.1480079482.git.sd@queasysnail.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161127_111126_242305_B7C012BE X-CRM114-Status: UNSURE ( 7.74 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2001:4b98:c:538:0:0:0:194 listed in] [list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sabrina Dubroca MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Sabrina Dubroca --- src/drivers/driver_macsec_qca.c | 10 +--------- src/drivers/driver_wired.c | 10 +--------- src/drivers/driver_wired_common.c | 7 +++++++ src/drivers/driver_wired_common.h | 2 ++ 4 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/drivers/driver_macsec_qca.c b/src/drivers/driver_macsec_qca.c index eccd1d9d6c4a..8d0c98e2821c 100644 --- a/src/drivers/driver_macsec_qca.c +++ b/src/drivers/driver_macsec_qca.c @@ -91,14 +91,6 @@ static int macsec_qca_get_bssid(void *priv, u8 *bssid) } -static int macsec_qca_get_capa(void *priv, struct wpa_driver_capa *capa) -{ - os_memset(capa, 0, sizeof(*capa)); - capa->flags = WPA_DRIVER_FLAGS_WIRED; - return 0; -} - - static void __macsec_drv_init(struct macsec_qca_data *drv) { int ret = 0; @@ -758,7 +750,7 @@ const struct wpa_driver_ops wpa_driver_macsec_qca_ops = { .desc = "QCA MACsec Ethernet driver", .get_ssid = macsec_qca_get_ssid, .get_bssid = macsec_qca_get_bssid, - .get_capa = macsec_qca_get_capa, + .get_capa = driver_wired_get_capa, .init = macsec_qca_init, .deinit = macsec_qca_deinit, diff --git a/src/drivers/driver_wired.c b/src/drivers/driver_wired.c index 86589a471ae4..8512c39b5106 100644 --- a/src/drivers/driver_wired.c +++ b/src/drivers/driver_wired.c @@ -380,14 +380,6 @@ static int wpa_driver_wired_get_bssid(void *priv, u8 *bssid) } -static int wpa_driver_wired_get_capa(void *priv, struct wpa_driver_capa *capa) -{ - os_memset(capa, 0, sizeof(*capa)); - capa->flags = WPA_DRIVER_FLAGS_WIRED; - return 0; -} - - static void * wpa_driver_wired_init(void *ctx, const char *ifname) { struct wpa_driver_wired_data *drv; @@ -422,7 +414,7 @@ const struct wpa_driver_ops wpa_driver_wired_ops = { .hapd_send_eapol = wired_send_eapol, .get_ssid = wpa_driver_wired_get_ssid, .get_bssid = wpa_driver_wired_get_bssid, - .get_capa = wpa_driver_wired_get_capa, + .get_capa = driver_wired_get_capa, .init = wpa_driver_wired_init, .deinit = wpa_driver_wired_deinit, }; diff --git a/src/drivers/driver_wired_common.c b/src/drivers/driver_wired_common.c index 94f6bf6daf24..d483f1de7afb 100644 --- a/src/drivers/driver_wired_common.c +++ b/src/drivers/driver_wired_common.c @@ -158,6 +158,13 @@ int wired_multicast_membership(int sock, int ifindex, const u8 *addr, int add) #endif /* __linux__ */ } +int driver_wired_get_capa(void *priv, struct wpa_driver_capa *capa) +{ + os_memset(capa, 0, sizeof(*capa)); + capa->flags = WPA_DRIVER_FLAGS_WIRED; + return 0; +} + #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) int driver_wired_get_ifstatus(const char *ifname, int *status) { diff --git a/src/drivers/driver_wired_common.h b/src/drivers/driver_wired_common.h index 292cfffe0b29..7b0dd399ca83 100644 --- a/src/drivers/driver_wired_common.h +++ b/src/drivers/driver_wired_common.h @@ -26,6 +26,8 @@ int driver_wired_get_ifflags(const char *ifname, int *flags); int driver_wired_set_ifflags(const char *ifname, int flags); int driver_wired_multi(const char *ifname, const u8 *addr, int add); int wired_multicast_membership(int sock, int ifindex, const u8 *addr, int add); +int driver_wired_get_capa(void *priv, struct wpa_driver_capa *capa); + #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__FreeBSD_kernel__) int driver_wired_get_ifstatus(const char *ifname, int *status); #endif /* defined(__FreeBSD__) || defined(__DragonFly__) || defined(FreeBSD_kernel__) */