orinoco: consolidate storage of WEP and TKIP keys

When TKIP support was added, we stored the keys separately to avoid
issues when both TKIP and WEP keys are sent to the driver.

We need to consolidate the storage to convert to cfg80211, so do this
first and try iron out the issues.

Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/orinoco/orinoco.h b/drivers/net/wireless/orinoco/orinoco.h
index badfc566524..9ac6f1dda4b 100644
--- a/drivers/net/wireless/orinoco/orinoco.h
+++ b/drivers/net/wireless/orinoco/orinoco.h
@@ -120,7 +120,8 @@ struct orinoco_private {
         enum nl80211_iftype iw_mode;
         enum orinoco_alg encode_alg;
         u16 wep_restrict, tx_key;
-        struct orinoco_key keys[ORINOCO_MAX_KEYS];
+        struct key_params keys[ORINOCO_MAX_KEYS];
+
         int bitratemode;
         char nick[IW_ESSID_MAX_SIZE+1];
         char desired_essid[IW_ESSID_MAX_SIZE+1];
@@ -150,7 +151,6 @@ struct orinoco_private {
         u8 *wpa_ie;
         int wpa_ie_len;
 
-        struct orinoco_tkip_key tkip_key[ORINOCO_MAX_KEYS];
         struct crypto_hash *rx_tfm_mic;
         struct crypto_hash *tx_tfm_mic;