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

diff --git a/net80211/ieee80211_crypto.h b/net80211/ieee80211_crypto.h
index 9a49dc0ec41aa368dbec7e23b7bb9310fb7bba45..637a7a7473e40a456dcb8b28c5dd63355a50e13e 100644 (file)
--- 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 5e2e6d68605838aa6006778851abdde42a698d13..988449dce691e64b96ba699569b9a602b9b34003 100644 (file)
--- 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 394f0d29d89d5bfd98bee3f46b0431c85ef4dd84..7e688df66db63aa237ce4291d3f6a8e52026f6e2 100644 (file)
--- 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);