aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-18 17:29:21 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:53:00 -0400
commitea49c359f36d5b40bf033c45a08332cb73777aa2 (patch)
tree07d99bbaca451af42d633e63c9c0c20d4f2d6f79 /include/net/mac80211.h
parentf97df02e23269c7650869f6192e809f8ac1a4b39 (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 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index fcca9c39b9e7..8fb975f0bed4 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -551,12 +551,12 @@ struct ieee80211_if_conf {
551 * @ALG_TKIP: TKIP 551 * @ALG_TKIP: TKIP
552 * @ALG_CCMP: CCMP (AES) 552 * @ALG_CCMP: CCMP (AES)
553 */ 553 */
554typedef enum ieee80211_key_alg { 554enum ieee80211_key_alg {
555 ALG_NONE, 555 ALG_NONE,
556 ALG_WEP, 556 ALG_WEP,
557 ALG_TKIP, 557 ALG_TKIP,
558 ALG_CCMP, 558 ALG_CCMP,
559} ieee80211_key_alg; 559};
560 560
561 561
562/** 562/**
@@ -596,7 +596,7 @@ enum ieee80211_key_flags {
596 * @key: key material 596 * @key: key material
597 */ 597 */
598struct ieee80211_key_conf { 598struct ieee80211_key_conf {
599 ieee80211_key_alg alg; 599 enum ieee80211_key_alg alg;
600 u8 hw_key_idx; 600 u8 hw_key_idx;
601 u8 flags; 601 u8 flags;
602 s8 keyidx; 602 s8 keyidx;
@@ -616,9 +616,9 @@ struct ieee80211_key_conf {
616 * @SET_KEY: a key is set 616 * @SET_KEY: a key is set
617 * @DISABLE_KEY: a key must be disabled 617 * @DISABLE_KEY: a key must be disabled
618 */ 618 */
619typedef enum set_key_cmd { 619enum set_key_cmd {
620 SET_KEY, DISABLE_KEY, 620 SET_KEY, DISABLE_KEY,
621} set_key_cmd; 621};
622 622
623 623
624/** 624/**
@@ -1014,7 +1014,7 @@ struct ieee80211_ops {
1014 unsigned int *total_flags, 1014 unsigned int *total_flags,
1015 int mc_count, struct dev_addr_list *mc_list); 1015 int mc_count, struct dev_addr_list *mc_list);
1016 int (*set_tim)(struct ieee80211_hw *hw, int aid, int set); 1016 int (*set_tim)(struct ieee80211_hw *hw, int aid, int set);
1017 int (*set_key)(struct ieee80211_hw *hw, set_key_cmd cmd, 1017 int (*set_key)(struct ieee80211_hw *hw, enum set_key_cmd cmd,
1018 const u8 *local_address, const u8 *address, 1018 const u8 *local_address, const u8 *address,
1019 struct ieee80211_key_conf *key); 1019 struct ieee80211_key_conf *key);
1020 int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x); 1020 int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x);