From: Tony Cho Date: Tue, 20 Oct 2015 05:26:50 +0000 (+0900) Subject: staging: wilc1000: rename drvHandler in the struct wilc_vif X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3134a57875e2cb87d6c84088fc634fa4e1c155c4;p=deliverable%2Flinux.git 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 493e02cf34ab..11e26fb1090b 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -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; } } 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); diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h index 6ac93280b8a2..521d3cbe50fb 100644 --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h @@ -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; };