diff options
| author | Tony Cho | 2015-10-20 07:26:50 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-25 02:14:35 +0100 |
| commit | 3134a57875e2cb87d6c84088fc634fa4e1c155c4 (patch) | |
| tree | 4cbf87aa9b9651798fead6a35923b69b3645f18c /drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | |
| parent | staging: wilc1000: rename aBSSID in the sturct wilc_vif (diff) | |
| download | kernel-qcow2-linux-3134a57875e2cb87d6c84088fc634fa4e1c155c4.tar.gz kernel-qcow2-linux-3134a57875e2cb87d6c84088fc634fa4e1c155c4.tar.xz kernel-qcow2-linux-3134a57875e2cb87d6c84088fc634fa4e1c155c4.zip | |
staging: wilc1000: rename drvHandler in the struct wilc_vif
This patch renames drvHandler in the struct wilc_vif to the hif_drv.
Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000/wilc_wfi_cfgoperations.c')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index c166d3f0e409..2dfc0fde7d2e 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -2585,16 +2585,16 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, nic->iftype = interface_type; /*Setting interface 1 drv handler and mac address in newly downloaded FW*/ - host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].drvHandler); - host_int_set_MacAddress(g_linux_wlan->vif[0].drvHandler, + host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv); + host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv, g_linux_wlan->vif[0].src_addr); host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE); /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].drvHandler, + host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv, g_key_wep_params.key_idx); - host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].drvHandler, + host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv, g_key_wep_params.key, g_key_wep_params.key_len, g_key_wep_params.key_idx); @@ -2666,16 +2666,16 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, wilc1000_wlan_init(dev, nic); g_wilc_initialized = 1; - host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].drvHandler); - host_int_set_MacAddress(g_linux_wlan->vif[0].drvHandler, + host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv); + host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv, g_linux_wlan->vif[0].src_addr); host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE); /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].drvHandler, + host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv, g_key_wep_params.key_idx); - host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].drvHandler, + host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv, g_key_wep_params.key, g_key_wep_params.key_len, g_key_wep_params.key_idx); @@ -2781,16 +2781,16 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, /*Setting interface 1 drv handler and mac address in newly downloaded FW*/ - host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].drvHandler); - host_int_set_MacAddress(g_linux_wlan->vif[0].drvHandler, + host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv); + host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv, g_linux_wlan->vif[0].src_addr); host_int_set_operation_mode(priv->hWILCWFIDrv, AP_MODE); /*Add saved WEP keys, if any*/ if (g_wep_keys_saved) { - host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].drvHandler, + host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv, g_key_wep_params.key_idx); - host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].drvHandler, + host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv, g_key_wep_params.key, g_key_wep_params.key_len, g_key_wep_params.key_idx); |