summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-12-28 15:41:24 +0100
committerImre Kaloz <kaloz@openwrt.org>2014-12-28 15:41:24 +0100
commitf92c46695d92dc23606d65bb32611e92235c30fc (patch)
tree44cc1000f3bfcf38db36ef801b67af919da9a2c9
parent28120935bc38e3861a885d745ec6ebe3f603611e (diff)
rename key_type to mwl_key_type to avoid clash with linux/key.h
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
-rw-r--r--mwl_fwcmd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mwl_fwcmd.c b/mwl_fwcmd.c
index d549c76..9cb95bd 100644
--- a/mwl_fwcmd.c
+++ b/mwl_fwcmd.c
@@ -830,7 +830,7 @@ struct aes_type_key {
} __packed;
-union key_type {
+union mwl_key_type {
struct wep_type_key wep_key;
struct tkip_type_key tkip_key;
@@ -852,7 +852,7 @@ struct key_param_set {
/* Size of the key */
u16 key_len;
/* Key material (variable size array) */
- union key_type key;
+ union mwl_key_type key;
u8 mac_addr[ETH_ALEN];
} __packed;