diff options
| author |   Sagi Grimberg <sagi@lightbitslabs.com> | 2018-12-03 17:52:05 -0800 |
|---|---|---|
| committer |   Christoph Hellwig <hch@lst.de> | 2018-12-13 09:58:52 +0100 |
| commit | 3152a974678a1e80c3c16d4b86522ecc500be529 (patch) | |
| tree | 68ac131cb045ae5e82f4107bfd5b739d956d10bb /drivers/net/wireless/ath/ath6kl/wmi.h | |
| parent | blkcg: handle dying request_queue when associating a blkg (diff) | |
| download | linux-dev-3152a974678a1e80c3c16d4b86522ecc500be529.tar.xz linux-dev-3152a974678a1e80c3c16d4b86522ecc500be529.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/wmi.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.h b/drivers/net/wireless/ath/ath6kl/wmi.h index a60bb49fe920..784940ba4c90 100644 --- 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, |