Skip to content

Commit 3152a97

Browse files
Sagi GrimbergChristoph Hellwig
authored andcommitted
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>
1 parent 0273ac3 commit 3152a97

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

drivers/net/wireless/ath/ath6kl/cfg80211.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,
13221322
struct ath6kl_vif *vif = netdev_priv(ndev);
13231323
struct ath6kl_key *key = NULL;
13241324
u8 key_usage;
1325-
enum crypto_type key_type = NONE_CRYPT;
1325+
enum ath6kl_crypto_type key_type = NONE_CRYPT;
13261326

13271327
ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "%s: index %d\n", __func__, key_index);
13281328

drivers/net/wireless/ath/ath6kl/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct ath6kl_llc_snap_hdr {
6767
__be16 eth_type;
6868
} __packed;
6969

70-
enum crypto_type {
70+
enum ath6kl_crypto_type {
7171
NONE_CRYPT = 0x01,
7272
WEP_CRYPT = 0x02,
7373
TKIP_CRYPT = 0x04,

drivers/net/wireless/ath/ath6kl/wmi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,9 +1849,9 @@ int ath6kl_wmi_connect_cmd(struct wmi *wmi, u8 if_idx,
18491849
enum network_type nw_type,
18501850
enum dot11_auth_mode dot11_auth_mode,
18511851
enum auth_mode auth_mode,
1852-
enum crypto_type pairwise_crypto,
1852+
enum ath6kl_crypto_type pairwise_crypto,
18531853
u8 pairwise_crypto_len,
1854-
enum crypto_type group_crypto,
1854+
enum ath6kl_crypto_type group_crypto,
18551855
u8 group_crypto_len, int ssid_len, u8 *ssid,
18561856
u8 *bssid, u16 channel, u32 ctrl_flags,
18571857
u8 nw_subtype)
@@ -2301,7 +2301,7 @@ int ath6kl_wmi_disctimeout_cmd(struct wmi *wmi, u8 if_idx, u8 timeout)
23012301
}
23022302

23032303
int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index,
2304-
enum crypto_type key_type,
2304+
enum ath6kl_crypto_type key_type,
23052305
u8 key_usage, u8 key_len,
23062306
u8 *key_rsc, unsigned int key_rsc_len,
23072307
u8 *key_material,

drivers/net/wireless/ath/ath6kl/wmi.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,9 +2556,9 @@ int ath6kl_wmi_connect_cmd(struct wmi *wmi, u8 if_idx,
25562556
enum network_type nw_type,
25572557
enum dot11_auth_mode dot11_auth_mode,
25582558
enum auth_mode auth_mode,
2559-
enum crypto_type pairwise_crypto,
2559+
enum ath6kl_crypto_type pairwise_crypto,
25602560
u8 pairwise_crypto_len,
2561-
enum crypto_type group_crypto,
2561+
enum ath6kl_crypto_type group_crypto,
25622562
u8 group_crypto_len, int ssid_len, u8 *ssid,
25632563
u8 *bssid, u16 channel, u32 ctrl_flags,
25642564
u8 nw_subtype);
@@ -2610,7 +2610,7 @@ int ath6kl_wmi_config_debug_module_cmd(struct wmi *wmi, u32 valid, u32 config);
26102610

26112611
int ath6kl_wmi_get_stats_cmd(struct wmi *wmi, u8 if_idx);
26122612
int ath6kl_wmi_addkey_cmd(struct wmi *wmi, u8 if_idx, u8 key_index,
2613-
enum crypto_type key_type,
2613+
enum ath6kl_crypto_type key_type,
26142614
u8 key_usage, u8 key_len,
26152615
u8 *key_rsc, unsigned int key_rsc_len,
26162616
u8 *key_material,

0 commit comments

Comments
 (0)