ath6kl: add ath6kl_ prefix to crypto_type

Prevent a namespace conflict as in following patches as skbuff.h will
include the crypto API.

Acked-by: David S. Miller <davem@davemloft.net>
Cc: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Sagi Grimberg <sagi@lightbitslabs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c
index e121187f371ff5e023b5efda39af6847b5a2c47a..fa049c4ae315b7f5c732609945f19da71d87c678 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/cfg80211.c
+++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c
@@ -1322,7 +1322,7 @@ static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,
        struct ath6kl_vif *vif = netdev_priv(ndev);
        struct ath6kl_key *key = NULL;
        u8 key_usage;
-       enum crypto_type key_type = NONE_CRYPT;
+       enum ath6kl_crypto_type key_type = NONE_CRYPT;
 
        ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);
 

diff --git a/drivers/net/wireless/ath/ath6kl/common.h b/drivers/net/wireless/ath/ath6kl/common.h
index 4f82e8632d37ba10a321e3182b6bb8ffa7d594f7..d6e5234f67a1efe649e66c05e25b063ebf0bc786 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/common.h
+++ b/drivers/net/wireless/ath/ath6kl/common.h
@@ -67,7 +67,7 @@ struct ath6kl_llc_snap_hdr {
        __be16 eth_type;
 } __packed;
 
-enum crypto_type {
+enum ath6kl_crypto_type {
        NONE_CRYPT          = 0x01,
        WEP_CRYPT           = 0x02,
        TKIP_CRYPT          = 0x04,

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index 777acc564ac9917d331de8f2ef87657199ce482a..9d7ac1ab2d02da6d7e4ebc9177fbbd0a77cb94b3 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1849,9 +1849,9 @@ int ath6kl_wmi_connect_cmd(struct wmi *wmi, u8 if_idx,
                           enum network_type nw_type,
                           enum dot11_auth_mode dot11_auth_mode,
                           enum auth_mode auth_mode,
-                          enum crypto_type pairwise_crypto,
+                          enum ath6kl_crypto_type pairwise_crypto,
                           u8 pairwise_crypto_len,
-                          enum crypto_type group_crypto,
+                          enum ath6kl_crypto_type group_crypto,
                           u8 group_crypto_len, int ssid_len, u8 *ssid,
                           u8 *bssid, u16 channel, u32 ctrl_flags,
                           u8 nw_subtype)
@@ -2301,7 +2301,7 @@ int ath6kl_wmi_disctimeout_cmd(struct wmi *wmi, u8 if_idx, u8 timeout)
 }
 
 int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index,
-                         enum crypto_type key_type,
+                         enum ath6kl_crypto_type key_type,
                          u8 key_usage, u8 key_len,
                          u8 *key_rsc, unsigned int key_rsc_len,
                          u8 *key_material,

diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h
index a60bb49fe920c1959eccb5eb4b975d1c2fb46949..784940ba4c909614fa6911b9237264b9e095929a 100644 (file)
--- a/drivers/net/wireless/ath/ath6kl/wmi.h
+++ b/drivers/net/wireless/ath/ath6kl/wmi.h
@@ -2556,9 +2556,9 @@ int ath6kl_wmi_connect_cmd(struct wmi *wmi, u8 if_idx,
                           enum network_type nw_type,
                           enum dot11_auth_mode dot11_auth_mode,
                           enum auth_mode auth_mode,
-                          enum crypto_type pairwise_crypto,
+                          enum ath6kl_crypto_type pairwise_crypto,
                           u8 pairwise_crypto_len,
-                          enum crypto_type group_crypto,
+                          enum ath6kl_crypto_type group_crypto,
                           u8 group_crypto_len, int ssid_len, u8 *ssid,
                           u8 *bssid, u16 channel, u32 ctrl_flags,
                           u8 nw_subtype);
@@ -2610,7 +2610,7 @@ int ath6kl_wmi_config_debug_module_cmd(struct wmi *wmi, u32 valid, u32 config);
 
 int ath6kl_wmi_get_stats_cmd(struct wmi *wmi, u8 if_idx);
 int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index,
-                         enum crypto_type key_type,
+                         enum ath6kl_crypto_type key_type,
                          u8 key_usage, u8 key_len,
                          u8 *key_rsc, unsigned int key_rsc_len,
                          u8 *key_material,