Commit f24374aa authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman

staging: wilc1000: rename pstrWFIDrv of function dev_state_ev_handler

This patch renames pstrWFIDrv of function dev_state_ev_handler to hif_drv
to avoid CamelCase naming convention.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 682d7c95
...@@ -122,7 +122,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -122,7 +122,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
{ {
struct in_ifaddr *dev_iface = (struct in_ifaddr *)ptr; struct in_ifaddr *dev_iface = (struct in_ifaddr *)ptr;
struct wilc_priv *priv; struct wilc_priv *priv;
struct host_if_drv *pstrWFIDrv; struct host_if_drv *hif_drv;
struct net_device *dev; struct net_device *dev;
u8 *pIP_Add_buff; u8 *pIP_Add_buff;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
...@@ -149,9 +149,9 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -149,9 +149,9 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
PRINT_D(GENERIC_DBG, "No Wireless Priv\n"); PRINT_D(GENERIC_DBG, "No Wireless Priv\n");
return NOTIFY_DONE; return NOTIFY_DONE;
} }
pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv; hif_drv = (struct host_if_drv *)priv->hWILCWFIDrv;
nic = netdev_priv(dev); nic = netdev_priv(dev);
if (!nic || !pstrWFIDrv) { if (!nic || !hif_drv) {
PRINT_D(GENERIC_DBG, "No Wireless Priv\n"); PRINT_D(GENERIC_DBG, "No Wireless Priv\n");
return NOTIFY_DONE; return NOTIFY_DONE;
} }
...@@ -166,20 +166,20 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -166,20 +166,20 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
/*If we are in station mode or client mode*/ /*If we are in station mode or client mode*/
if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) { if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) {
pstrWFIDrv->IFC_UP = 1; hif_drv->IFC_UP = 1;
g_obtainingIP = false; g_obtainingIP = false;
del_timer(&hDuringIpTimer); del_timer(&hDuringIpTimer);
PRINT_D(GENERIC_DBG, "IP obtained , enable scan\n"); PRINT_D(GENERIC_DBG, "IP obtained , enable scan\n");
} }
if (bEnablePS) if (bEnablePS)
host_int_set_power_mgmt(pstrWFIDrv, 1, 0); host_int_set_power_mgmt(hif_drv, 1, 0);
PRINT_D(GENERIC_DBG, "[%s] Up IP\n", dev_iface->ifa_label); PRINT_D(GENERIC_DBG, "[%s] Up IP\n", dev_iface->ifa_label);
pIP_Add_buff = (char *) (&(dev_iface->ifa_address)); pIP_Add_buff = (char *) (&(dev_iface->ifa_address));
PRINT_D(GENERIC_DBG, "IP add=%d:%d:%d:%d\n", pIP_Add_buff[0], pIP_Add_buff[1], pIP_Add_buff[2], pIP_Add_buff[3]); PRINT_D(GENERIC_DBG, "IP add=%d:%d:%d:%d\n", pIP_Add_buff[0], pIP_Add_buff[1], pIP_Add_buff[2], pIP_Add_buff[3]);
host_int_setup_ipaddress(pstrWFIDrv, pIP_Add_buff, nic->u8IfIdx); host_int_setup_ipaddress(hif_drv, pIP_Add_buff, nic->u8IfIdx);
break; break;
...@@ -188,21 +188,21 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -188,21 +188,21 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event
PRINT_INFO(GENERIC_DBG, "\n ============== IP Address Released ===============\n\n"); PRINT_INFO(GENERIC_DBG, "\n ============== IP Address Released ===============\n\n");
if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) { if (nic->iftype == STATION_MODE || nic->iftype == CLIENT_MODE) {
pstrWFIDrv->IFC_UP = 0; hif_drv->IFC_UP = 0;
g_obtainingIP = false; g_obtainingIP = false;
} }
if (memcmp(dev_iface->ifa_label, wlan_dev_name, 5) == 0) if (memcmp(dev_iface->ifa_label, wlan_dev_name, 5) == 0)
host_int_set_power_mgmt(pstrWFIDrv, 0, 0); host_int_set_power_mgmt(hif_drv, 0, 0);
resolve_disconnect_aberration(pstrWFIDrv); resolve_disconnect_aberration(hif_drv);
PRINT_D(GENERIC_DBG, "[%s] Down IP\n", dev_iface->ifa_label); PRINT_D(GENERIC_DBG, "[%s] Down IP\n", dev_iface->ifa_label);
pIP_Add_buff = null_ip; pIP_Add_buff = null_ip;
PRINT_D(GENERIC_DBG, "IP add=%d:%d:%d:%d\n", pIP_Add_buff[0], pIP_Add_buff[1], pIP_Add_buff[2], pIP_Add_buff[3]); PRINT_D(GENERIC_DBG, "IP add=%d:%d:%d:%d\n", pIP_Add_buff[0], pIP_Add_buff[1], pIP_Add_buff[2], pIP_Add_buff[3]);
host_int_setup_ipaddress(pstrWFIDrv, pIP_Add_buff, nic->u8IfIdx); host_int_setup_ipaddress(hif_drv, pIP_Add_buff, nic->u8IfIdx);
break; break;
......
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