iwmc3200wifi: cfg80211 key hooks implemetation

This patch implements the new cfg80211 privacy related hooks: add/get/set_key
and the set_default_key one.
With this implementation we can now call the wext-compat *encode* routines and
reduce our own wext code.

Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/net/wireless/iwmc3200wifi/iwm.h b/drivers/net/wireless/iwmc3200wifi/iwm.h
index d8d4ae2d91b0..90b05d999635 100644
--- a/drivers/net/wireless/iwmc3200wifi/iwm.h
+++ b/drivers/net/wireless/iwmc3200wifi/iwm.h
@@ -162,13 +162,11 @@ struct iwm_umac_key_hdr {
 
 struct iwm_key {
         struct iwm_umac_key_hdr hdr;
-        u8 in_use;
-        u8 alg;
-        u32 flags;
-        u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE];
-        u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE];
-        u8 key_len;
-        u8 key[32];
+        u32 cipher;
+        u8 key[WLAN_MAX_KEY_LEN];
+        u8 seq[IW_ENCODE_SEQ_MAX_SIZE];
+        int key_len;
+        int seq_len;
 };
 
 #define IWM_RX_ID_HASH  0xff
@@ -276,7 +274,7 @@ struct iwm_priv {
         struct iwm_tx_queue txq[IWM_TX_QUEUES];
 
         struct iwm_key keys[IWM_NUM_KEYS];
-        struct iwm_key *default_key;
+        s8 default_key;
 
         DECLARE_BITMAP(wifi_ntfy, WIFI_IF_NTFY_MAX);
         wait_queue_head_t wifi_ntfy_queue;