diff options
author | Jouni Malinen <j@w1.fi> | 2009-12-11 00:15:54 +0200 |
---|---|---|
committer | Jouni Malinen <j@w1.fi> | 2009-12-11 00:15:54 +0200 |
commit | 9008a3e44d3607099f10df31016dcde97a25c6d7 (patch) | |
tree | 33ad3716ef757f0ff743d79a3bd77301d1cd0c19 /src | |
parent | 90b8c4c5f8733c9c17cbd95174aefaadbf11ba2a (diff) | |
download | external_wpa_supplicant_8_ti-9008a3e44d3607099f10df31016dcde97a25c6d7.zip external_wpa_supplicant_8_ti-9008a3e44d3607099f10df31016dcde97a25c6d7.tar.gz external_wpa_supplicant_8_ti-9008a3e44d3607099f10df31016dcde97a25c6d7.tar.bz2 |
Merge get_seqnum_igtk() driver op with get_seqnum()
IEEE 802.11w uses distinct key indexes (4 and 5) so the same
get_seqnum() handler can be used to fetch packet number for both
TKIP/CCMP and BIP(using IGTK).
Since the new get_seqnum_igtk() handler was not actually implemented by
any driver wrapper, this may also fix BIP/IGTK sequence number reporting
with driver_nl80211.c.
Diffstat (limited to 'src')
-rw-r--r-- | src/drivers/driver.h | 19 | ||||
-rw-r--r-- | src/drivers/driver_ndis.c | 1 |
2 files changed, 3 insertions, 17 deletions
diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 153a27b..c4e7b73 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1117,27 +1117,14 @@ struct wpa_driver_ops { * Returns: 0 on success, -1 on failure * * This function is used to fetch the last used TSC/packet number for - * a TKIP or CCMP key. + * a TKIP, CCMP, or BIP/IGTK key. It is mainly used with group keys, so + * there is no strict requirement on implementing support for unicast + * keys (i.e., addr != %NULL). */ int (*get_seqnum)(const char *ifname, void *priv, const u8 *addr, int idx, u8 *seq); /** - * get_seqnum_igtk - Fetch the IGTK packet number (AP only) - * @ifname: The interface name (main or virtual) - * @priv: Private driver interface data - * @addr: %NULL for group keys - * @idx: Key index - * @seq: Buffer for returning the last used packet number - * Returns: 0 on success, -1 on failure - * - * This function is used to fetch the last used packet number for an - * IGTK key. - */ - int (*get_seqnum_igtk)(const char *ifname, void *priv, const u8 *addr, - int idx, u8 *seq); - - /** * flush - Flush all association stations (AP only) * @priv: Private driver interface data * Returns: 0 on success, -1 on failure diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c index 1c71d78..bec1e8d 100644 --- a/src/drivers/driver_ndis.c +++ b/src/drivers/driver_ndis.c @@ -3211,7 +3211,6 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = { NULL /* set_ieee8021x */, NULL /* set_privacy */, NULL /* get_seqnum */, - NULL /* get_seqnum_igtk */, NULL /* flush */, NULL /* set_generic_elem */, NULL /* read_sta_data */, |