This patch renames drvHandler in the struct wilc_vif to the hif_drv.

Signed-off-by: Tony Cho <tony....@atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c             |  2 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 24 +++++++++++------------
 drivers/staging/wilc1000/wilc_wfi_netdevice.h     |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/wilc1000/linux_wlan.c 
b/drivers/staging/wilc1000/linux_wlan.c
index 6478f6e..6e21825 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1313,7 +1313,7 @@ int mac_open(struct net_device *ndev)
        for (i = 0; i < wl->vif_num; i++)
                if (ndev == wl->vif[i].wilc_netdev) {
                        memcpy(wl->vif[i].src_addr, mac_add, ETH_ALEN);
-                       wl->vif[i].drvHandler = priv->hWILCWFIDrv;
+                       wl->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 150397a..d7c9279 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2586,16 +2586,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(wl->vif[0].drvHandler);
-                       host_int_set_MacAddress(wl->vif[0].drvHandler,
+                       host_int_set_wfi_drv_handler(wl->vif[0].hif_drv);
+                       host_int_set_MacAddress(wl->vif[0].hif_drv,
                                                wl->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(wl->vif[0].drvHandler,
+                               host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv,
                                                             
g_key_wep_params.key_idx);
-                               
host_int_add_wep_key_bss_sta(wl->vif[0].drvHandler,
+                               host_int_add_wep_key_bss_sta(wl->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(wl->vif[0].drvHandler);
-                       host_int_set_MacAddress(wl->vif[0].drvHandler,
+                       host_int_set_wfi_drv_handler(wl->vif[0].hif_drv);
+                       host_int_set_MacAddress(wl->vif[0].hif_drv,
                                                wl->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(wl->vif[0].drvHandler,
+                               host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv,
                                                             
g_key_wep_params.key_idx);
-                               
host_int_add_wep_key_bss_sta(wl->vif[0].drvHandler,
+                               host_int_add_wep_key_bss_sta(wl->vif[0].hif_drv,
                                                             
g_key_wep_params.key,
                                                             
g_key_wep_params.key_len,
                                                             
g_key_wep_params.key_idx);
@@ -2782,16 +2782,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(wl->vif[0].drvHandler);
-               host_int_set_MacAddress(wl->vif[0].drvHandler,
+               host_int_set_wfi_drv_handler(wl->vif[0].hif_drv);
+               host_int_set_MacAddress(wl->vif[0].hif_drv,
                                        wl->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(wl->vif[0].drvHandler,
+                       host_int_set_WEPDefaultKeyID(wl->vif[0].hif_drv,
                                                     g_key_wep_params.key_idx);
-                       host_int_add_wep_key_bss_sta(wl->vif[0].drvHandler,
+                       host_int_add_wep_key_bss_sta(wl->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 14bfd05..64b931b 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;
 };
 
-- 
1.9.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to