You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
107 lines
3.7 KiB
107 lines
3.7 KiB
From 9281e5c5ce83648d344808e08f213f4e11a44573 Mon Sep 17 00:00:00 2001 |
|
Message-Id: <9281e5c5ce83648d344808e08f213f4e11a44573.1488376602.git.dcaratti@redhat.com> |
|
From: Sabrina Dubroca <sd@queasysnail.net> |
|
Date: Sun, 27 Nov 2016 20:08:52 +0100 |
|
Subject: [PATCH] drivers: Move driver_wired_get_capa() to a common file |
|
|
|
This continues refactoring of the common parts of wired drivers code |
|
into a shared file, so that they can be reused by other drivers. |
|
|
|
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> |
|
--- |
|
src/drivers/driver_macsec_qca.c | 10 +--------- |
|
src/drivers/driver_wired.c | 10 +--------- |
|
src/drivers/driver_wired_common.c | 8 ++++++++ |
|
src/drivers/driver_wired_common.h | 1 + |
|
4 files changed, 11 insertions(+), 18 deletions(-) |
|
|
|
diff --git a/src/drivers/driver_macsec_qca.c b/src/drivers/driver_macsec_qca.c |
|
index 30bf31c..15ea4bd 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 54217bc..fd8a7e3 100644 |
|
--- a/src/drivers/driver_wired.c |
|
+++ b/src/drivers/driver_wired.c |
|
@@ -382,14 +382,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; |
|
@@ -424,7 +416,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 73c2b1b..b31474d 100644 |
|
--- a/src/drivers/driver_wired_common.c |
|
+++ b/src/drivers/driver_wired_common.c |
|
@@ -164,6 +164,14 @@ 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) |
|
+{ |
|
+ 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 f362dbd..b926d83 100644 |
|
--- a/src/drivers/driver_wired_common.h |
|
+++ b/src/drivers/driver_wired_common.h |
|
@@ -26,6 +26,7 @@ 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); |
|
int driver_wired_get_ifstatus(const char *ifname, int *status); |
|
|
|
int driver_wired_init_common(struct driver_wired_common_data *common, |
|
-- |
|
2.7.4 |
|
|
|
|