public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

staging: wilc1000: rename drvHandler in the struct wilc_vif

Browse source 
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>
This commit is contained in:
Tony Cho 2015-10-20 14:26:50 +09:00 • committed by Greg Kroah-Hartman
parent 7201cd2ca5
commit 3134a57875
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/wilc1000/linux_wlan.c
View file

@ -1314,7 +1314,7 @@ int mac_open(struct net_device *ndev)
for (i = 0; i < g_linux_wlan->vif_num; i++) {
if (ndev == g_linux_wlan->vif[i].wilc_netdev) {
memcpy(g_linux_wlan->vif[i].src_addr, mac_add, ETH_ALEN);
g_linux_wlan->vif[i].drvHandler = priv->hWILCWFIDrv;
g_linux_wlan->vif[i].hif_drv = priv->hWILCWFIDrv;
break;
}
}

24
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
View file

@ -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);

2
drivers/staging/wilc1000/wilc_wfi_netdevice.h
View file

@ -151,7 +151,7 @@ typedef struct {
struct wilc_vif {
u8 src_addr[ETH_ALEN];
u8 bssid[ETH_ALEN];
struct host_if_drv *drvHandler;
struct host_if_drv *hif_drv;
struct net_device *wilc_netdev;
};