From efd52870b72877b80057fd23ee512db3d01b214b Mon Sep 17 00:00:00 2001 From: mentor Date: Fri, 21 Dec 2007 17:46:02 +0000 Subject: [PATCH] Change delete key IOCTL request structure to use ieee80211_keyix_t. Ticket: http://madwifi.org/ticket/1702 WARNING: This changes userspace ABI - hostapd WILL need to be recompiled git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3068 0192ed92-7a03-0410-a25b-9323aeb14dbd --- net80211/ieee80211_crypto.h | 2 +- net80211/ieee80211_ioctl.h | 3 +-- net80211/ieee80211_wireless.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/net80211/ieee80211_crypto.h b/net80211/ieee80211_crypto.h index 9a49dc0..637a7a7 100644 --- a/net80211/ieee80211_crypto.h +++ b/net80211/ieee80211_crypto.h @@ -106,7 +106,7 @@ struct ieee80211_key { #define IEEE80211_CIPHER_MAX (IEEE80211_CIPHER_NONE + 1) -#define IEEE80211_KEYIX_NONE ((ieee80211_keyix_t) (uint8_t)-1) +#define IEEE80211_KEYIX_NONE ((ieee80211_keyix_t)-1) #if defined(__KERNEL__) || defined(_KERNEL) diff --git a/net80211/ieee80211_ioctl.h b/net80211/ieee80211_ioctl.h index 5e2e6d6..988449d 100644 --- a/net80211/ieee80211_ioctl.h +++ b/net80211/ieee80211_ioctl.h @@ -221,8 +221,7 @@ struct ieee80211req_key { * to IEEE80211_KEYIX_NONE when deleting a unicast key. */ struct ieee80211req_del_key { - /* XXX: This should be ieee80211_keyix_t, but it changes API/ABI for hostapd */ - u_int8_t idk_keyix; /* key index */ + ieee80211_keyix_t idk_keyix; /* key index */ u_int8_t idk_macaddr[IEEE80211_ADDR_LEN]; }; diff --git a/net80211/ieee80211_wireless.c b/net80211/ieee80211_wireless.c index 394f0d2..7e688df 100644 --- a/net80211/ieee80211_wireless.c +++ b/net80211/ieee80211_wireless.c @@ -3400,7 +3400,7 @@ ieee80211_ioctl_delkey(struct net_device *dev, struct iw_request_info *info, /* XXX: This cast can be removed when struct ieee80211req_del_key is * fixed. */ - if (dk->idk_keyix == (u_int8_t) IEEE80211_KEYIX_NONE) { + if (dk->idk_keyix == IEEE80211_KEYIX_NONE) { struct ieee80211_node *ni; ni = ieee80211_find_node(&ic->ic_sta, dk->idk_macaddr); -- 2.35.1