From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 18 Sep 2007 21:29:21 +0000 (-0400)
Subject: [PATCH] mac80211: remove crypto algorithm typedef
X-Git-Tag: v2.6.24-rc1~1454^2~323
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea49c359f36d5b40bf033c45a08332cb73777aa2;p=linux-2.6

[PATCH] mac80211: remove crypto algorithm typedef

The typedef is not required, we can just use "enum ieee80211_key_alg"
instead of "ieee80211_key_alg"

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8acda640df..0700076e55 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -7293,7 +7293,7 @@ out_unlock:
 	return rc;
 }
 
-static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd,
+static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 			   const u8 *local_addr, const u8 *addr,
 			   struct ieee80211_key_conf *key)
 {
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 7b9227c562..7bc25f74e3 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -7690,7 +7690,7 @@ out_unlock:
 	return rc;
 }
 
-static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd,
+static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 			   const u8 *local_addr, const u8 *addr,
 			   struct ieee80211_key_conf *key)
 {
diff --git a/drivers/net/wireless/iwlwifi/iwlwifi.h b/drivers/net/wireless/iwlwifi/iwlwifi.h
index 00c79e200c..e0b97c3412 100644
--- a/drivers/net/wireless/iwlwifi/iwlwifi.h
+++ b/drivers/net/wireless/iwlwifi/iwlwifi.h
@@ -412,7 +412,7 @@ struct iwl_tid_data {
 };
 
 struct iwl_hw_key {
-	ieee80211_key_alg alg;
+	enum ieee80211_key_alg alg;
 	int keylen;
 	u8 key[32];
 };
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index fcca9c39b9..8fb975f0be 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -551,12 +551,12 @@ struct ieee80211_if_conf {
  * @ALG_TKIP: TKIP
  * @ALG_CCMP: CCMP (AES)
  */
-typedef enum ieee80211_key_alg {
+enum ieee80211_key_alg {
 	ALG_NONE,
 	ALG_WEP,
 	ALG_TKIP,
 	ALG_CCMP,
-} ieee80211_key_alg;
+};
 
 
 /**
@@ -596,7 +596,7 @@ enum ieee80211_key_flags {
  * @key: key material
  */
 struct ieee80211_key_conf {
-	ieee80211_key_alg alg;
+	enum ieee80211_key_alg alg;
 	u8 hw_key_idx;
 	u8 flags;
 	s8 keyidx;
@@ -616,9 +616,9 @@ struct ieee80211_key_conf {
  * @SET_KEY: a key is set
  * @DISABLE_KEY: a key must be disabled
  */
-typedef enum set_key_cmd {
+enum set_key_cmd {
 	SET_KEY, DISABLE_KEY,
-} set_key_cmd;
+};
 
 
 /**
@@ -1014,7 +1014,7 @@ struct ieee80211_ops {
 				 unsigned int *total_flags,
 				 int mc_count, struct dev_addr_list *mc_list);
 	int (*set_tim)(struct ieee80211_hw *hw, int aid, int set);
-	int (*set_key)(struct ieee80211_hw *hw, set_key_cmd cmd,
+	int (*set_key)(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 		       const u8 *local_address, const u8 *address,
 		       struct ieee80211_key_conf *key);
 	int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x);
diff --git a/net/mac80211/ieee80211_key.h b/net/mac80211/ieee80211_key.h
index ae49418f18..fc770e98d4 100644
--- a/net/mac80211/ieee80211_key.h
+++ b/net/mac80211/ieee80211_key.h
@@ -114,7 +114,7 @@ struct ieee80211_key {
 
 struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
 					  struct sta_info *sta,
-					  ieee80211_key_alg alg,
+					  enum ieee80211_key_alg alg,
 					  int idx,
 					  size_t key_len,
 					  const u8 *key_data);
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index c10e53afbb..f13d46b2c1 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -113,7 +113,7 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
 
 struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
 					  struct sta_info *sta,
-					  ieee80211_key_alg alg,
+					  enum ieee80211_key_alg alg,
 					  int idx,
 					  size_t key_len,
 					  const u8 *key_data)