Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ea49c359f36d5b40bf033c45a08332cb73777aa2
Commit: ea49c359f36d5b40bf033c45a08332cb73777aa2
Parent: f97df02e23269c7650869f6192e809f8ac1a4b39
Author: Johannes Berg <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 18 17:29:21 2007 -0400
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:53:00 2007 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Michael Wu <[EMAIL PROTECTED]>
Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 +-
drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 +-
drivers/net/wireless/iwlwifi/iwlwifi.h | 2 +-
include/net/mac80211.h | 12 ++++++------
net/mac80211/ieee80211_key.h | 2 +-
net/mac80211/key.c | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c
b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 8acda64..0700076 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 7b9227c..7bc25f7 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 00c79e2..e0b97c3 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 fcca9c3..8fb975f 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 ae49418..fc770e9 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 c10e53a..f13d46b 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
