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.
204 lines
7.2 KiB
204 lines
7.2 KiB
From 8ebfc7c2ba77ac1f71577b3ddc46a050d9fb1103 Mon Sep 17 00:00:00 2001 |
|
Message-Id: <8ebfc7c2ba77ac1f71577b3ddc46a050d9fb1103.1488376601.git.dcaratti@redhat.com> |
|
From: Sabrina Dubroca <sd@queasysnail.net> |
|
Date: Fri, 7 Oct 2016 12:08:09 +0200 |
|
Subject: [PATCH] mka: Pass full structures down to macsec drivers' transmit SC |
|
ops |
|
|
|
Clean up the driver interface by passing pointers to struct transmit_sc |
|
down the stack to the {create,delete}_transmit_sc() ops, instead of |
|
passing the individual arguments. |
|
|
|
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> |
|
--- |
|
src/drivers/driver.h | 13 ++++++------- |
|
src/drivers/driver_macsec_qca.c | 13 +++++++------ |
|
src/pae/ieee802_1x_kay.h | 5 ++--- |
|
src/pae/ieee802_1x_secy_ops.c | 5 ++--- |
|
wpa_supplicant/driver_i.h | 10 ++++------ |
|
wpa_supplicant/wpas_kay.c | 11 ++++------- |
|
6 files changed, 25 insertions(+), 32 deletions(-) |
|
|
|
diff --git a/src/drivers/driver.h b/src/drivers/driver.h |
|
index f1915fc..1e2d623 100644 |
|
--- a/src/drivers/driver.h |
|
+++ b/src/drivers/driver.h |
|
@@ -3423,21 +3423,20 @@ struct wpa_driver_ops { |
|
/** |
|
* create_transmit_sc - create secure connection for transmit |
|
* @priv: private driver interface data from init() |
|
- * @channel: secure channel |
|
- * @sci_addr: secure channel identifier - address |
|
- * @sci_port: secure channel identifier - port |
|
+ * @sc: secure channel |
|
+ * @conf_offset: confidentiality offset (0, 30, or 50) |
|
* Returns: 0 on success, -1 on failure |
|
*/ |
|
- int (*create_transmit_sc)(void *priv, u32 channel, const u8 *sci_addr, |
|
- u16 sci_port, unsigned int conf_offset); |
|
+ int (*create_transmit_sc)(void *priv, struct transmit_sc *sc, |
|
+ unsigned int conf_offset); |
|
|
|
/** |
|
* delete_transmit_sc - delete secure connection for transmit |
|
* @priv: private driver interface data from init() |
|
- * @channel: secure channel |
|
+ * @sc: secure channel |
|
* Returns: 0 on success, -1 on failure |
|
*/ |
|
- int (*delete_transmit_sc)(void *priv, u32 channel); |
|
+ int (*delete_transmit_sc)(void *priv, struct transmit_sc *sc); |
|
|
|
/** |
|
* create_transmit_sa - create secure association for transmit |
|
diff --git a/src/drivers/driver_macsec_qca.c b/src/drivers/driver_macsec_qca.c |
|
index 2867c31..fef93df 100644 |
|
--- a/src/drivers/driver_macsec_qca.c |
|
+++ b/src/drivers/driver_macsec_qca.c |
|
@@ -750,14 +750,14 @@ static int macsec_qca_get_available_transmit_sc(void *priv, u32 *channel) |
|
} |
|
|
|
|
|
-static int macsec_qca_create_transmit_sc(void *priv, u32 channel, |
|
- const u8 *sci_addr, u16 sci_port, |
|
+static int macsec_qca_create_transmit_sc(void *priv, struct transmit_sc *sc, |
|
unsigned int conf_offset) |
|
{ |
|
struct macsec_qca_data *drv = priv; |
|
int ret = 0; |
|
fal_tx_class_lut_t entry; |
|
u8 psci[ETH_ALEN + 2]; |
|
+ u32 channel = sc->channel; |
|
|
|
wpa_printf(MSG_DEBUG, "%s: channel=%d", __func__, channel); |
|
|
|
@@ -768,9 +768,9 @@ static int macsec_qca_create_transmit_sc(void *priv, u32 channel, |
|
entry.action = FAL_TX_CLASS_ACTION_FORWARD; |
|
entry.channel = channel; |
|
|
|
- os_memcpy(psci, sci_addr, ETH_ALEN); |
|
- psci[6] = (sci_port >> 8) & 0xf; |
|
- psci[7] = sci_port & 0xf; |
|
+ os_memcpy(psci, sc->sci.addr, ETH_ALEN); |
|
+ psci[6] = (sc->sci.port >> 8) & 0xf; |
|
+ psci[7] = sc->sci.port & 0xf; |
|
|
|
ret += nss_macsec_secy_tx_class_lut_set(drv->secy_id, channel, &entry); |
|
ret += nss_macsec_secy_tx_sc_create(drv->secy_id, channel, psci, 8); |
|
@@ -784,11 +784,12 @@ static int macsec_qca_create_transmit_sc(void *priv, u32 channel, |
|
} |
|
|
|
|
|
-static int macsec_qca_delete_transmit_sc(void *priv, u32 channel) |
|
+static int macsec_qca_delete_transmit_sc(void *priv, struct transmit_sc *sc) |
|
{ |
|
struct macsec_qca_data *drv = priv; |
|
int ret = 0; |
|
fal_tx_class_lut_t entry; |
|
+ u32 channel = sc->channel; |
|
|
|
wpa_printf(MSG_DEBUG, "%s: channel=%d", __func__, channel); |
|
|
|
diff --git a/src/pae/ieee802_1x_kay.h b/src/pae/ieee802_1x_kay.h |
|
index 8ee5860..8cd5fa6 100644 |
|
--- a/src/pae/ieee802_1x_kay.h |
|
+++ b/src/pae/ieee802_1x_kay.h |
|
@@ -155,10 +155,9 @@ struct ieee802_1x_kay_ctx { |
|
int (*enable_receive_sa)(void *ctx, struct receive_sa *sa); |
|
int (*disable_receive_sa)(void *ctx, struct receive_sa *sa); |
|
int (*get_available_transmit_sc)(void *ctx, u32 *channel); |
|
- int (*create_transmit_sc)(void *ctx, u32 channel, |
|
- const struct ieee802_1x_mka_sci *sci, |
|
+ int (*create_transmit_sc)(void *ctx, struct transmit_sc *sc, |
|
enum confidentiality_offset co); |
|
- int (*delete_transmit_sc)(void *ctx, u32 channel); |
|
+ int (*delete_transmit_sc)(void *ctx, struct transmit_sc *sc); |
|
int (*create_transmit_sa)(void *ctx, struct transmit_sa *sa); |
|
int (*enable_transmit_sa)(void *ctx, struct transmit_sa *sa); |
|
int (*disable_transmit_sa)(void *ctx, struct transmit_sa *sa); |
|
diff --git a/src/pae/ieee802_1x_secy_ops.c b/src/pae/ieee802_1x_secy_ops.c |
|
index fb376df..669dc98 100644 |
|
--- a/src/pae/ieee802_1x_secy_ops.c |
|
+++ b/src/pae/ieee802_1x_secy_ops.c |
|
@@ -338,8 +338,7 @@ int secy_create_transmit_sc(struct ieee802_1x_kay *kay, |
|
return -1; |
|
} |
|
|
|
- return ops->create_transmit_sc(ops->ctx, txsc->channel, &txsc->sci, |
|
- kay->co); |
|
+ return ops->create_transmit_sc(ops->ctx, txsc, kay->co); |
|
} |
|
|
|
|
|
@@ -360,7 +359,7 @@ int secy_delete_transmit_sc(struct ieee802_1x_kay *kay, |
|
return -1; |
|
} |
|
|
|
- return ops->delete_transmit_sc(ops->ctx, txsc->channel); |
|
+ return ops->delete_transmit_sc(ops->ctx, txsc); |
|
} |
|
|
|
|
|
diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h |
|
index 666798b..2dc74bf 100644 |
|
--- a/wpa_supplicant/driver_i.h |
|
+++ b/wpa_supplicant/driver_i.h |
|
@@ -835,23 +835,21 @@ wpa_drv_get_available_transmit_sc(struct wpa_supplicant *wpa_s, u32 *channel) |
|
} |
|
|
|
static inline int |
|
-wpa_drv_create_transmit_sc(struct wpa_supplicant *wpa_s, u32 channel, |
|
- const u8 *sci_addr, u16 sci_port, |
|
+wpa_drv_create_transmit_sc(struct wpa_supplicant *wpa_s, struct transmit_sc *sc, |
|
unsigned int conf_offset) |
|
{ |
|
if (!wpa_s->driver->create_transmit_sc) |
|
return -1; |
|
- return wpa_s->driver->create_transmit_sc(wpa_s->drv_priv, channel, |
|
- sci_addr, sci_port, |
|
+ return wpa_s->driver->create_transmit_sc(wpa_s->drv_priv, sc, |
|
conf_offset); |
|
} |
|
|
|
static inline int wpa_drv_delete_transmit_sc(struct wpa_supplicant *wpa_s, |
|
- u32 channel) |
|
+ struct transmit_sc *sc) |
|
{ |
|
if (!wpa_s->driver->delete_transmit_sc) |
|
return -1; |
|
- return wpa_s->driver->delete_transmit_sc(wpa_s->drv_priv, channel); |
|
+ return wpa_s->driver->delete_transmit_sc(wpa_s->drv_priv, sc); |
|
} |
|
|
|
static inline int wpa_drv_create_transmit_sa(struct wpa_supplicant *wpa_s, |
|
diff --git a/wpa_supplicant/wpas_kay.c b/wpa_supplicant/wpas_kay.c |
|
index 344c59e..e0f8e28 100644 |
|
--- a/wpa_supplicant/wpas_kay.c |
|
+++ b/wpa_supplicant/wpas_kay.c |
|
@@ -142,19 +142,16 @@ static int wpas_get_available_transmit_sc(void *wpa_s, u32 *channel) |
|
|
|
|
|
static int |
|
-wpas_create_transmit_sc(void *wpa_s, u32 channel, |
|
- const struct ieee802_1x_mka_sci *sci, |
|
+wpas_create_transmit_sc(void *wpa_s, struct transmit_sc *sc, |
|
enum confidentiality_offset co) |
|
{ |
|
- return wpa_drv_create_transmit_sc(wpa_s, channel, sci->addr, |
|
- be_to_host16(sci->port), |
|
- conf_offset_val(co)); |
|
+ return wpa_drv_create_transmit_sc(wpa_s, sc, conf_offset_val(co)); |
|
} |
|
|
|
|
|
-static int wpas_delete_transmit_sc(void *wpa_s, u32 channel) |
|
+static int wpas_delete_transmit_sc(void *wpa_s, struct transmit_sc *sc) |
|
{ |
|
- return wpa_drv_delete_transmit_sc(wpa_s, channel); |
|
+ return wpa_drv_delete_transmit_sc(wpa_s, sc); |
|
} |
|
|
|
|
|
-- |
|
2.7.4 |
|
|
|
|