From df8b4830a0ac547a18cdf701ca9a04b4c4f3b05b Mon Sep 17 00:00:00 2001 From: Chaehyun Lim Date: Mon, 26 Oct 2015 09:44:45 +0900 Subject: [PATCH] staging: wilc1000: rename host_int_set_WEPDefaultKeyID This patch replaces host_int_set_WEPDefaultKeyID with host_int_set_wep_default_key to avoid camelcase. Signed-off-by: Chaehyun Lim Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wilc1000/host_interface.c | 2 +- drivers/staging/wilc1000/host_interface.h | 2 +- drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 4f1af61..e5ffe52 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -3128,7 +3128,7 @@ int host_int_remove_wep_key(struct host_if_drv *hif_drv, u8 index) return result; } -int host_int_set_WEPDefaultKeyID(struct host_if_drv *hif_drv, u8 index) +int host_int_set_wep_default_key(struct host_if_drv *hif_drv, u8 index) { int result = 0; struct host_if_msg msg; diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index ea91bbf..f3fb628 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -384,7 +384,7 @@ int host_int_remove_wep_key(struct host_if_drv *wfi_drv, u8 index); * @date 8 March 2012 * @version 1.0 */ -int host_int_set_WEPDefaultKeyID(struct host_if_drv *hif_drv, u8 index); +int host_int_set_wep_default_key(struct host_if_drv *hif_drv, u8 index); /** * @brief sets WEP deafault key diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index 5559aa6..ac32d2b 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -892,7 +892,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, g_key_wep_params.key_idx = sme->key_idx; g_wep_keys_saved = true; - host_int_set_WEPDefaultKeyID(priv->hWILCWFIDrv, sme->key_idx); + host_int_set_wep_default_key(priv->hWILCWFIDrv, sme->key_idx); host_int_add_wep_key_bss_sta(priv->hWILCWFIDrv, sme->key, sme->key_len, sme->key_idx); } else if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104) { u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED; @@ -909,7 +909,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, g_key_wep_params.key_idx = sme->key_idx; g_wep_keys_saved = true; - host_int_set_WEPDefaultKeyID(priv->hWILCWFIDrv, sme->key_idx); + host_int_set_wep_default_key(priv->hWILCWFIDrv, sme->key_idx); host_int_add_wep_key_bss_sta(priv->hWILCWFIDrv, sme->key, sme->key_len, sme->key_idx); } else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2) { if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_TKIP) { @@ -1502,7 +1502,7 @@ static int set_default_key(struct wiphy *wiphy, struct net_device *netdev, u8 ke if (key_index != priv->WILC_WFI_wep_default) { - host_int_set_WEPDefaultKeyID(priv->hWILCWFIDrv, key_index); + host_int_set_wep_default_key(priv->hWILCWFIDrv, key_index); } return 0; @@ -2605,7 +2605,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv, + host_int_set_wep_default_key(wl->vif[0].hif_drv, g_key_wep_params.key_idx); host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, g_key_wep_params.key, @@ -2687,7 +2687,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv, + host_int_set_wep_default_key(wl->vif[0].hif_drv, g_key_wep_params.key_idx); host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, g_key_wep_params.key, @@ -2803,7 +2803,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv, + host_int_set_wep_default_key(wl->vif[0].hif_drv, g_key_wep_params.key_idx); host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, g_key_wep_params.key, -- 2.7.4