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.
104 lines
3.5 KiB
104 lines
3.5 KiB
From 8618313b6ef1c40002836ffc56d70466ea80d44e Mon Sep 17 00:00:00 2001 |
|
Message-Id: <8618313b6ef1c40002836ffc56d70466ea80d44e.1488376602.git.dcaratti@redhat.com> |
|
From: Sabrina Dubroca <sd@queasysnail.net> |
|
Date: Sun, 27 Nov 2016 20:08:54 +0100 |
|
Subject: [PATCH] drivers: Move driver_wired_get_ssid() 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 | 9 +-------- |
|
src/drivers/driver_wired.c | 9 +-------- |
|
src/drivers/driver_wired_common.c | 7 +++++++ |
|
src/drivers/driver_wired_common.h | 1 + |
|
4 files changed, 10 insertions(+), 16 deletions(-) |
|
|
|
diff --git a/src/drivers/driver_macsec_qca.c b/src/drivers/driver_macsec_qca.c |
|
index 4bbc59f..d3be19c 100644 |
|
--- a/src/drivers/driver_macsec_qca.c |
|
+++ b/src/drivers/driver_macsec_qca.c |
|
@@ -76,13 +76,6 @@ struct macsec_qca_data { |
|
}; |
|
|
|
|
|
-static int macsec_qca_get_ssid(void *priv, u8 *ssid) |
|
-{ |
|
- ssid[0] = 0; |
|
- return 0; |
|
-} |
|
- |
|
- |
|
static void __macsec_drv_init(struct macsec_qca_data *drv) |
|
{ |
|
int ret = 0; |
|
@@ -740,7 +733,7 @@ static int macsec_qca_disable_transmit_sa(void *priv, struct transmit_sa *sa) |
|
const struct wpa_driver_ops wpa_driver_macsec_qca_ops = { |
|
.name = "macsec_qca", |
|
.desc = "QCA MACsec Ethernet driver", |
|
- .get_ssid = macsec_qca_get_ssid, |
|
+ .get_ssid = driver_wired_get_ssid, |
|
.get_bssid = driver_wired_get_bssid, |
|
.get_capa = driver_wired_get_capa, |
|
.init = macsec_qca_init, |
|
diff --git a/src/drivers/driver_wired.c b/src/drivers/driver_wired.c |
|
index ad34627..7e09dcf 100644 |
|
--- a/src/drivers/driver_wired.c |
|
+++ b/src/drivers/driver_wired.c |
|
@@ -367,13 +367,6 @@ static void wired_driver_hapd_deinit(void *priv) |
|
} |
|
|
|
|
|
-static int wpa_driver_wired_get_ssid(void *priv, u8 *ssid) |
|
-{ |
|
- ssid[0] = 0; |
|
- return 0; |
|
-} |
|
- |
|
- |
|
static void * wpa_driver_wired_init(void *ctx, const char *ifname) |
|
{ |
|
struct wpa_driver_wired_data *drv; |
|
@@ -406,7 +399,7 @@ const struct wpa_driver_ops wpa_driver_wired_ops = { |
|
.hapd_init = wired_driver_hapd_init, |
|
.hapd_deinit = wired_driver_hapd_deinit, |
|
.hapd_send_eapol = wired_send_eapol, |
|
- .get_ssid = wpa_driver_wired_get_ssid, |
|
+ .get_ssid = driver_wired_get_ssid, |
|
.get_bssid = driver_wired_get_bssid, |
|
.get_capa = driver_wired_get_capa, |
|
.init = wpa_driver_wired_init, |
|
diff --git a/src/drivers/driver_wired_common.c b/src/drivers/driver_wired_common.c |
|
index d30d3a4..2e169d7 100644 |
|
--- a/src/drivers/driver_wired_common.c |
|
+++ b/src/drivers/driver_wired_common.c |
|
@@ -164,6 +164,13 @@ int wired_multicast_membership(int sock, int ifindex, const u8 *addr, int add) |
|
} |
|
|
|
|
|
+int driver_wired_get_ssid(void *priv, u8 *ssid) |
|
+{ |
|
+ ssid[0] = 0; |
|
+ return 0; |
|
+} |
|
+ |
|
+ |
|
int driver_wired_get_bssid(void *priv, u8 *bssid) |
|
{ |
|
/* Report PAE group address as the "BSSID" for wired connection. */ |
|
diff --git a/src/drivers/driver_wired_common.h b/src/drivers/driver_wired_common.h |
|
index 493987a..7e1a4ae 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_ssid(void *priv, u8 *ssid); |
|
int driver_wired_get_bssid(void *priv, u8 *bssid); |
|
int driver_wired_get_capa(void *priv, struct wpa_driver_capa *capa); |
|
int driver_wired_get_ifstatus(const char *ifname, int *status); |
|
-- |
|
2.7.4 |
|
|
|
|