Commit ea49c359 authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller

[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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarMichael Wu <flamingice@sourmilk.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f97df02e
......@@ -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)
{
......
......@@ -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)
{
......
......@@ -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];
};
......
......@@ -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);
......
......@@ -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);
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment