Commit df8b4830 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman

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: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e91d0349
...@@ -3128,7 +3128,7 @@ int host_int_remove_wep_key(struct host_if_drv *hif_drv, u8 index) ...@@ -3128,7 +3128,7 @@ int host_int_remove_wep_key(struct host_if_drv *hif_drv, u8 index)
return result; 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; int result = 0;
struct host_if_msg msg; struct host_if_msg msg;
......
...@@ -384,7 +384,7 @@ int host_int_remove_wep_key(struct host_if_drv *wfi_drv, u8 index); ...@@ -384,7 +384,7 @@ int host_int_remove_wep_key(struct host_if_drv *wfi_drv, u8 index);
* @date 8 March 2012 * @date 8 March 2012
* @version 1.0 * @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 * @brief sets WEP deafault key
......
...@@ -892,7 +892,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -892,7 +892,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
g_key_wep_params.key_idx = sme->key_idx; g_key_wep_params.key_idx = sme->key_idx;
g_wep_keys_saved = true; 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); 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) { } else if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_WEP104) {
u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED; u8security = ENCRYPT_ENABLED | WEP | WEP_EXTENDED;
...@@ -909,7 +909,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -909,7 +909,7 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
g_key_wep_params.key_idx = sme->key_idx; g_key_wep_params.key_idx = sme->key_idx;
g_wep_keys_saved = true; 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); 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) { } else if (sme->crypto.wpa_versions & NL80211_WPA_VERSION_2) {
if (sme->crypto.cipher_group == WLAN_CIPHER_SUITE_TKIP) { 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 ...@@ -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) { 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; return 0;
...@@ -2605,7 +2605,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2605,7 +2605,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
/*Add saved WEP keys, if any*/ /*Add saved WEP keys, if any*/
if (g_wep_keys_saved) { 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); g_key_wep_params.key_idx);
host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv,
g_key_wep_params.key, g_key_wep_params.key,
...@@ -2687,7 +2687,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2687,7 +2687,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
/*Add saved WEP keys, if any*/ /*Add saved WEP keys, if any*/
if (g_wep_keys_saved) { 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); g_key_wep_params.key_idx);
host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv,
g_key_wep_params.key, g_key_wep_params.key,
...@@ -2803,7 +2803,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, ...@@ -2803,7 +2803,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev,
/*Add saved WEP keys, if any*/ /*Add saved WEP keys, if any*/
if (g_wep_keys_saved) { 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); g_key_wep_params.key_idx);
host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv, host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv,
g_key_wep_params.key, g_key_wep_params.key,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment