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

staging: wilc1000: remove typedef from tstrWILC_WFIDrv

This patch removes typedef from the struct tstrWILC_WFIDrv and
rename it to host_if_drv.
This patch includes the removal of the comment for tstrWILC_WFIDrv as well.
Signed-off-by: default avatarLeo Kim <leo.kim@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a589f4f
This diff is collapsed.
This diff is collapsed.
...@@ -132,7 +132,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -132,7 +132,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;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
struct net_device *dev; struct net_device *dev;
u8 *pIP_Add_buff; u8 *pIP_Add_buff;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
...@@ -159,7 +159,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event ...@@ -159,7 +159,7 @@ 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 = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
nic = netdev_priv(dev); nic = netdev_priv(dev);
if (nic == NULL || pstrWFIDrv == NULL) { if (nic == NULL || pstrWFIDrv == NULL) {
PRINT_D(GENERIC_DBG, "No Wireless Priv\n"); PRINT_D(GENERIC_DBG, "No Wireless Priv\n");
...@@ -633,13 +633,13 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n ...@@ -633,13 +633,13 @@ static int linux_wlan_init_test_config(struct net_device *dev, linux_wlan_t *p_n
unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xff}; unsigned char mac_add[] = {0x00, 0x80, 0xC2, 0x5E, 0xa2, 0xff};
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
PRINT_D(TX_DBG, "Start configuring Firmware\n"); PRINT_D(TX_DBG, "Start configuring Firmware\n");
get_random_bytes(&mac_add[5], 1); get_random_bytes(&mac_add[5], 1);
get_random_bytes(&mac_add[4], 1); get_random_bytes(&mac_add[4], 1);
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
PRINT_D(INIT_DBG, "Host = %p\n", pstrWFIDrv); PRINT_D(INIT_DBG, "Host = %p\n", pstrWFIDrv);
PRINT_D(INIT_DBG, "MAC address is : %02x-%02x-%02x-%02x-%02x-%02x\n", mac_add[0], mac_add[1], mac_add[2], mac_add[3], mac_add[4], mac_add[5]); PRINT_D(INIT_DBG, "MAC address is : %02x-%02x-%02x-%02x-%02x-%02x\n", mac_add[0], mac_add[1], mac_add[2], mac_add[3], mac_add[4], mac_add[5]);
...@@ -1364,11 +1364,11 @@ static void wilc_set_multicast_list(struct net_device *dev) ...@@ -1364,11 +1364,11 @@ static void wilc_set_multicast_list(struct net_device *dev)
struct netdev_hw_addr *ha; struct netdev_hw_addr *ha;
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
int i = 0; int i = 0;
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (!dev) if (!dev)
return; return;
...@@ -1497,7 +1497,7 @@ int mac_close(struct net_device *ndev) ...@@ -1497,7 +1497,7 @@ int mac_close(struct net_device *ndev)
{ {
struct wilc_priv *priv; struct wilc_priv *priv;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
nic = netdev_priv(ndev); nic = netdev_priv(ndev);
...@@ -1513,7 +1513,7 @@ int mac_close(struct net_device *ndev) ...@@ -1513,7 +1513,7 @@ int mac_close(struct net_device *ndev)
return 0; return 0;
} }
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
PRINT_D(GENERIC_DBG, "Mac close\n"); PRINT_D(GENERIC_DBG, "Mac close\n");
......
...@@ -539,14 +539,14 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, ...@@ -539,14 +539,14 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent,
{ {
struct wilc_priv *priv; struct wilc_priv *priv;
struct net_device *dev; struct net_device *dev;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
connecting = 0; connecting = 0;
priv = (struct wilc_priv *)pUserVoid; priv = (struct wilc_priv *)pUserVoid;
dev = priv->dev; dev = priv->dev;
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) { if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {
/*Initialization*/ /*Initialization*/
...@@ -792,13 +792,13 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, ...@@ -792,13 +792,13 @@ static int connect(struct wiphy *wiphy, struct net_device *dev,
char *pcwpa_version = NULL; char *pcwpa_version = NULL;
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
tstrNetworkInfo *pstrNetworkInfo = NULL; tstrNetworkInfo *pstrNetworkInfo = NULL;
connecting = 1; connecting = 1;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)(priv->hWILCWFIDrv); pstrWFIDrv = (struct host_if_drv *)(priv->hWILCWFIDrv);
host_int_set_wfi_drv_handler(priv->hWILCWFIDrv); host_int_set_wfi_drv_handler(priv->hWILCWFIDrv);
...@@ -1034,14 +1034,14 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co ...@@ -1034,14 +1034,14 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co
{ {
s32 s32Error = 0; s32 s32Error = 0;
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u8 NullBssid[ETH_ALEN] = {0}; u8 NullBssid[ETH_ALEN] = {0};
connecting = 0; connecting = 0;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
/*Invalidate u8WLANChannel value on wlan0 disconnect*/ /*Invalidate u8WLANChannel value on wlan0 disconnect*/
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
if (!pstrWFIDrv->u8P2PConnect) if (!pstrWFIDrv->u8P2PConnect)
u8WLANChannel = INVALID_CHANNEL; u8WLANChannel = INVALID_CHANNEL;
linux_wlan_set_bssid(priv->dev, NullBssid); linux_wlan_set_bssid(priv->dev, NullBssid);
...@@ -1948,12 +1948,12 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size) ...@@ -1948,12 +1948,12 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size)
struct wilc_priv *priv; struct wilc_priv *priv;
u32 header, pkt_offset; u32 header, pkt_offset;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u32 i = 0; u32 i = 0;
s32 s32Freq; s32 s32Freq;
priv = wiphy_priv(dev->ieee80211_ptr->wiphy); priv = wiphy_priv(dev->ieee80211_ptr->wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
/* Get WILC header */ /* Get WILC header */
memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET); memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET);
...@@ -2249,14 +2249,14 @@ static int mgmt_tx(struct wiphy *wiphy, ...@@ -2249,14 +2249,14 @@ static int mgmt_tx(struct wiphy *wiphy,
struct p2p_mgmt_data *mgmt_tx; struct p2p_mgmt_data *mgmt_tx;
struct wilc_priv *priv; struct wilc_priv *priv;
s32 s32Error = 0; s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
u32 i; u32 i;
perInterface_wlan_t *nic; perInterface_wlan_t *nic;
u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom); u32 buf_len = len + sizeof(u8P2P_vendorspec) + sizeof(u8P2Plocalrandom);
nic = netdev_priv(wdev->netdev); nic = netdev_priv(wdev->netdev);
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
*cookie = (unsigned long)buf; *cookie = (unsigned long)buf;
priv->u64tx_cookie = *cookie; priv->u64tx_cookie = *cookie;
...@@ -2394,10 +2394,10 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy, ...@@ -2394,10 +2394,10 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy,
u64 cookie) u64 cookie)
{ {
struct wilc_priv *priv; struct wilc_priv *priv;
tstrWILC_WFIDrv *pstrWFIDrv; struct host_if_drv *pstrWFIDrv;
priv = wiphy_priv(wiphy); priv = wiphy_priv(wiphy);
pstrWFIDrv = (tstrWILC_WFIDrv *)priv->hWILCWFIDrv; pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies); PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies);
......
...@@ -121,7 +121,7 @@ struct wilc_priv { ...@@ -121,7 +121,7 @@ struct wilc_priv {
spinlock_t lock; spinlock_t lock;
struct net_device *dev; struct net_device *dev;
struct napi_struct napi; struct napi_struct napi;
tstrWILC_WFIDrv *hWILCWFIDrv; struct host_if_drv *hWILCWFIDrv;
struct host_if_pmkid_attr pmkid_list; struct host_if_pmkid_attr pmkid_list;
struct WILC_WFI_stats netstats; struct WILC_WFI_stats netstats;
u8 WILC_WFI_wep_default; u8 WILC_WFI_wep_default;
...@@ -151,7 +151,7 @@ typedef struct { ...@@ -151,7 +151,7 @@ typedef struct {
typedef struct { typedef struct {
u8 aSrcAddress[ETH_ALEN]; u8 aSrcAddress[ETH_ALEN];
u8 aBSSID[ETH_ALEN]; u8 aBSSID[ETH_ALEN];
tstrWILC_WFIDrv *drvHandler; struct host_if_drv *drvHandler;
struct net_device *wilc_netdev; struct net_device *wilc_netdev;
} tstrInterfaceInfo; } tstrInterfaceInfo;
typedef struct { typedef struct {
......
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