OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Johannes Berg 2007-09-18 17:29:21 -04:00 committed by David S. Miller
parent f97df02e23
commit ea49c359f3
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl3945-base.c
View File

@ -7293,7 +7293,7 @@ out_unlock:
return rc; 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, const u8 *local_addr, const u8 *addr,
struct ieee80211_key_conf *key) struct ieee80211_key_conf *key)
{ {

2
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@ -7690,7 +7690,7 @@ out_unlock:
return rc; 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, const u8 *local_addr, const u8 *addr,
struct ieee80211_key_conf *key) struct ieee80211_key_conf *key)
{ {

2
drivers/net/wireless/iwlwifi/iwlwifi.h
View File

@ -412,7 +412,7 @@ struct iwl_tid_data {
}; };
struct iwl_hw_key { struct iwl_hw_key {
ieee80211_key_alg alg; enum ieee80211_key_alg alg;
int keylen; int keylen;
u8 key[32]; u8 key[32];
}; };

12
include/net/mac80211.h
View File

@ -551,12 +551,12 @@ struct ieee80211_if_conf {
* @ALG_TKIP: TKIP * @ALG_TKIP: TKIP
* @ALG_CCMP: CCMP (AES) * @ALG_CCMP: CCMP (AES)
*/ */
typedef enum ieee80211_key_alg { enum ieee80211_key_alg {
ALG_NONE, ALG_NONE,
ALG_WEP, ALG_WEP,
ALG_TKIP, ALG_TKIP,
ALG_CCMP, ALG_CCMP,
} ieee80211_key_alg; };
/** /**
@ -596,7 +596,7 @@ enum ieee80211_key_flags {
* @key: key material * @key: key material
*/ */
struct ieee80211_key_conf { struct ieee80211_key_conf {
ieee80211_key_alg alg; enum ieee80211_key_alg alg;
u8 hw_key_idx; u8 hw_key_idx;
u8 flags; u8 flags;
s8 keyidx; s8 keyidx;
@ -616,9 +616,9 @@ struct ieee80211_key_conf {
* @SET_KEY: a key is set * @SET_KEY: a key is set
* @DISABLE_KEY: a key must be disabled * @DISABLE_KEY: a key must be disabled
*/ */
typedef enum set_key_cmd { enum set_key_cmd {
SET_KEY, DISABLE_KEY, SET_KEY, DISABLE_KEY,
} set_key_cmd; };
/** /**
@ -1014,7 +1014,7 @@ struct ieee80211_ops {
unsigned int *total_flags, unsigned int *total_flags,
int mc_count, struct dev_addr_list *mc_list); int mc_count, struct dev_addr_list *mc_list);
int (*set_tim)(struct ieee80211_hw *hw, int aid, int set); 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, const u8 *local_address, const u8 *address,
struct ieee80211_key_conf *key); struct ieee80211_key_conf *key);
int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x); int (*set_ieee8021x)(struct ieee80211_hw *hw, int use_ieee8021x);

2
net/mac80211/ieee80211_key.h
View File

@ -114,7 +114,7 @@ struct ieee80211_key {
struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata, struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sta_info *sta,
ieee80211_key_alg alg, enum ieee80211_key_alg alg,
int idx, int idx,
size_t key_len, size_t key_len,
const u8 *key_data); const u8 *key_data);

2
net/mac80211/key.c
View File

@ -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 ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
struct sta_info *sta, struct sta_info *sta,
ieee80211_key_alg alg, enum ieee80211_key_alg alg,
int idx, int idx,
size_t key_len, size_t key_len,
const u8 *key_data) const u8 *key_data)