Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"
This reverts commit 78a5dac804c22aa6e4ec8226a864d3b0d6ccddbb.
Test: None
diff --git a/wpa_supplicant/driver_i.h b/wpa_supplicant/driver_i.h
index c9bb20d..220b7ba 100644
--- a/wpa_supplicant/driver_i.h
+++ b/wpa_supplicant/driver_i.h
@@ -715,14 +715,6 @@
return wpa_s->driver->macsec_deinit(wpa_s->drv_priv);
}
-static inline int wpa_drv_macsec_get_capability(struct wpa_supplicant *wpa_s,
- enum macsec_cap *cap)
-{
- if (!wpa_s->driver->macsec_get_capability)
- return -1;
- return wpa_s->driver->macsec_get_capability(wpa_s->drv_priv, cap);
-}
-
static inline int wpa_drv_enable_protect_frames(struct wpa_supplicant *wpa_s,
Boolean enabled)
{
@@ -757,127 +749,145 @@
}
static inline int wpa_drv_get_receive_lowest_pn(struct wpa_supplicant *wpa_s,
- struct receive_sa *sa)
+ u32 channel, u8 an,
+ u32 *lowest_pn)
{
if (!wpa_s->driver->get_receive_lowest_pn)
return -1;
- return wpa_s->driver->get_receive_lowest_pn(wpa_s->drv_priv, sa);
+ return wpa_s->driver->get_receive_lowest_pn(wpa_s->drv_priv, channel,
+ an, lowest_pn);
}
static inline int wpa_drv_get_transmit_next_pn(struct wpa_supplicant *wpa_s,
- struct transmit_sa *sa)
+ u32 channel, u8 an,
+ u32 *next_pn)
{
if (!wpa_s->driver->get_transmit_next_pn)
return -1;
- return wpa_s->driver->get_transmit_next_pn(wpa_s->drv_priv, sa);
+ return wpa_s->driver->get_transmit_next_pn(wpa_s->drv_priv, channel,
+ an, next_pn);
}
static inline int wpa_drv_set_transmit_next_pn(struct wpa_supplicant *wpa_s,
- struct transmit_sa *sa)
+ u32 channel, u8 an,
+ u32 next_pn)
{
if (!wpa_s->driver->set_transmit_next_pn)
return -1;
- return wpa_s->driver->set_transmit_next_pn(wpa_s->drv_priv, sa);
+ return wpa_s->driver->set_transmit_next_pn(wpa_s->drv_priv, channel,
+ an, next_pn);
+}
+
+static inline int wpa_drv_get_available_receive_sc(struct wpa_supplicant *wpa_s,
+ u32 *channel)
+{
+ if (!wpa_s->driver->get_available_receive_sc)
+ return -1;
+ return wpa_s->driver->get_available_receive_sc(wpa_s->drv_priv,
+ channel);
}
static inline int
-wpa_drv_create_receive_sc(struct wpa_supplicant *wpa_s, struct receive_sc *sc,
+wpa_drv_create_receive_sc(struct wpa_supplicant *wpa_s, u32 channel,
+ const u8 *sci_addr, u16 sci_port,
unsigned int conf_offset, int validation)
{
if (!wpa_s->driver->create_receive_sc)
return -1;
- return wpa_s->driver->create_receive_sc(wpa_s->drv_priv, sc,
- conf_offset, validation);
+ return wpa_s->driver->create_receive_sc(wpa_s->drv_priv, channel,
+ sci_addr, sci_port, conf_offset,
+ validation);
}
static inline int wpa_drv_delete_receive_sc(struct wpa_supplicant *wpa_s,
- struct receive_sc *sc)
+ u32 channel)
{
if (!wpa_s->driver->delete_receive_sc)
return -1;
- return wpa_s->driver->delete_receive_sc(wpa_s->drv_priv, sc);
+ return wpa_s->driver->delete_receive_sc(wpa_s->drv_priv, channel);
}
static inline int wpa_drv_create_receive_sa(struct wpa_supplicant *wpa_s,
- struct receive_sa *sa)
+ u32 channel, u8 an,
+ u32 lowest_pn, const u8 *sak)
{
if (!wpa_s->driver->create_receive_sa)
return -1;
- return wpa_s->driver->create_receive_sa(wpa_s->drv_priv, sa);
-}
-
-static inline int wpa_drv_delete_receive_sa(struct wpa_supplicant *wpa_s,
- struct receive_sa *sa)
-{
- if (!wpa_s->driver->delete_receive_sa)
- return -1;
- return wpa_s->driver->delete_receive_sa(wpa_s->drv_priv, sa);
+ return wpa_s->driver->create_receive_sa(wpa_s->drv_priv, channel, an,
+ lowest_pn, sak);
}
static inline int wpa_drv_enable_receive_sa(struct wpa_supplicant *wpa_s,
- struct receive_sa *sa)
+ u32 channel, u8 an)
{
if (!wpa_s->driver->enable_receive_sa)
return -1;
- return wpa_s->driver->enable_receive_sa(wpa_s->drv_priv, sa);
+ return wpa_s->driver->enable_receive_sa(wpa_s->drv_priv, channel, an);
}
static inline int wpa_drv_disable_receive_sa(struct wpa_supplicant *wpa_s,
- struct receive_sa *sa)
+ u32 channel, u8 an)
{
if (!wpa_s->driver->disable_receive_sa)
return -1;
- return wpa_s->driver->disable_receive_sa(wpa_s->drv_priv, sa);
+ return wpa_s->driver->disable_receive_sa(wpa_s->drv_priv, channel, an);
}
static inline int
-wpa_drv_create_transmit_sc(struct wpa_supplicant *wpa_s, struct transmit_sc *sc,
+wpa_drv_get_available_transmit_sc(struct wpa_supplicant *wpa_s, u32 *channel)
+{
+ if (!wpa_s->driver->get_available_transmit_sc)
+ return -1;
+ return wpa_s->driver->get_available_transmit_sc(wpa_s->drv_priv,
+ channel);
+}
+
+static inline int
+wpa_drv_create_transmit_sc(struct wpa_supplicant *wpa_s, u32 channel,
+ const u8 *sci_addr, u16 sci_port,
unsigned int conf_offset)
{
if (!wpa_s->driver->create_transmit_sc)
return -1;
- return wpa_s->driver->create_transmit_sc(wpa_s->drv_priv, sc,
+ return wpa_s->driver->create_transmit_sc(wpa_s->drv_priv, channel,
+ sci_addr, sci_port,
conf_offset);
}
static inline int wpa_drv_delete_transmit_sc(struct wpa_supplicant *wpa_s,
- struct transmit_sc *sc)
+ u32 channel)
{
if (!wpa_s->driver->delete_transmit_sc)
return -1;
- return wpa_s->driver->delete_transmit_sc(wpa_s->drv_priv, sc);
+ return wpa_s->driver->delete_transmit_sc(wpa_s->drv_priv, channel);
}
static inline int wpa_drv_create_transmit_sa(struct wpa_supplicant *wpa_s,
- struct transmit_sa *sa)
+ u32 channel, u8 an,
+ u32 next_pn,
+ Boolean confidentiality,
+ const u8 *sak)
{
if (!wpa_s->driver->create_transmit_sa)
return -1;
- return wpa_s->driver->create_transmit_sa(wpa_s->drv_priv, sa);
-}
-
-static inline int wpa_drv_delete_transmit_sa(struct wpa_supplicant *wpa_s,
- struct transmit_sa *sa)
-{
- if (!wpa_s->driver->delete_transmit_sa)
- return -1;
- return wpa_s->driver->delete_transmit_sa(wpa_s->drv_priv, sa);
+ return wpa_s->driver->create_transmit_sa(wpa_s->drv_priv, channel, an,
+ next_pn, confidentiality, sak);
}
static inline int wpa_drv_enable_transmit_sa(struct wpa_supplicant *wpa_s,
- struct transmit_sa *sa)
+ u32 channel, u8 an)
{
if (!wpa_s->driver->enable_transmit_sa)
return -1;
- return wpa_s->driver->enable_transmit_sa(wpa_s->drv_priv, sa);
+ return wpa_s->driver->enable_transmit_sa(wpa_s->drv_priv, channel, an);
}
static inline int wpa_drv_disable_transmit_sa(struct wpa_supplicant *wpa_s,
- struct transmit_sa *sa)
+ u32 channel, u8 an)
{
if (!wpa_s->driver->disable_transmit_sa)
return -1;
- return wpa_s->driver->disable_transmit_sa(wpa_s->drv_priv, sa);
+ return wpa_s->driver->disable_transmit_sa(wpa_s->drv_priv, channel, an);
}
#endif /* CONFIG_MACSEC */
@@ -966,13 +976,4 @@
return wpa_s->driver->set_default_scan_ies(wpa_s->drv_priv, ies, len);
}
-static inline int wpa_drv_set_tdls_mode(struct wpa_supplicant *wpa_s,
- int tdls_external_control)
-{
- if (!wpa_s->driver->set_tdls_mode)
- return -1;
- return wpa_s->driver->set_tdls_mode(wpa_s->drv_priv,
- tdls_external_control);
-}
-
#endif /* DRIVER_I_H */