diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-18 17:29:21 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:53:00 -0400 |
commit | ea49c359f36d5b40bf033c45a08332cb73777aa2 (patch) | |
tree | 07d99bbaca451af42d633e63c9c0c20d4f2d6f79 /drivers/net/wireless | |
parent | f97df02e23269c7650869f6192e809f8ac1a4b39 (diff) |
[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>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwlwifi.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 8acda640df25..0700076e55b2 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -7293,7 +7293,7 @@ out_unlock: | |||
7293 | return rc; | 7293 | return rc; |
7294 | } | 7294 | } |
7295 | 7295 | ||
7296 | static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd, | 7296 | static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, |
7297 | const u8 *local_addr, const u8 *addr, | 7297 | const u8 *local_addr, const u8 *addr, |
7298 | struct ieee80211_key_conf *key) | 7298 | struct ieee80211_key_conf *key) |
7299 | { | 7299 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7b9227c562b7..7bc25f74e3ab 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -7690,7 +7690,7 @@ out_unlock: | |||
7690 | return rc; | 7690 | return rc; |
7691 | } | 7691 | } |
7692 | 7692 | ||
7693 | static int iwl_mac_set_key(struct ieee80211_hw *hw, set_key_cmd cmd, | 7693 | static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, |
7694 | const u8 *local_addr, const u8 *addr, | 7694 | const u8 *local_addr, const u8 *addr, |
7695 | struct ieee80211_key_conf *key) | 7695 | struct ieee80211_key_conf *key) |
7696 | { | 7696 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwlwifi.h b/drivers/net/wireless/iwlwifi/iwlwifi.h index 00c79e200c68..e0b97c341215 100644 --- a/drivers/net/wireless/iwlwifi/iwlwifi.h +++ b/drivers/net/wireless/iwlwifi/iwlwifi.h | |||
@@ -412,7 +412,7 @@ struct iwl_tid_data { | |||
412 | }; | 412 | }; |
413 | 413 | ||
414 | struct iwl_hw_key { | 414 | struct iwl_hw_key { |
415 | ieee80211_key_alg alg; | 415 | enum ieee80211_key_alg alg; |
416 | int keylen; | 416 | int keylen; |
417 | u8 key[32]; | 417 | u8 key[32]; |
418 | }; | 418 | }; |