Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48b28df9 authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename hWILCWFIDrv of wilc_priv structure 



This patch renames hWILCWFIDrv pointer variable of wilc_priv structure
to hif_drv to avoid camelcase.

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 79df6a49

drivers/staging/wilc1000/linux_wlan.c

+4 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int dev_state_ev_handler(struct notifier_block *this, unsigned long event 
		PRINT_D(GENERIC_DBG, "No Wireless Priv\n");

		return NOTIFY_DONE;

	}

	hif_drv = (struct host_if_drv *)priv->hWILCWFIDrv;

	hif_drv = (struct host_if_drv *)priv->hif_drv;

	vif = netdev_priv(dev);

	if (!vif || !hif_drv) {

		PRINT_D(GENERIC_DBG, "No Wireless Priv\n");
@@ -515,7 +515,7 @@ static int linux_wlan_init_test_config(struct net_device *dev, 


	PRINT_D(TX_DBG, "Start configuring Firmware\n");

	priv = wiphy_priv(dev->ieee80211_ptr->wiphy);

	hif_drv = (struct host_if_drv *)priv->hWILCWFIDrv;

	hif_drv = (struct host_if_drv *)priv->hif_drv;

	PRINT_D(INIT_DBG, "Host = %p\n", hif_drv);

	wilc_get_mac_address(vif, mac_add);
@@ -1089,7 +1089,7 @@ static void wilc_set_multicast_list(struct net_device *dev) 


	priv = wiphy_priv(dev->ieee80211_ptr->wiphy);

	vif = netdev_priv(dev);

	hif_drv = (struct host_if_drv *)priv->hWILCWFIDrv;

	hif_drv = (struct host_if_drv *)priv->hif_drv;



	if (!dev)

		return;
@@ -1228,7 +1228,7 @@ int wilc_mac_close(struct net_device *ndev) 
		return 0;

	}



	hif_drv = (struct host_if_drv *)priv->hWILCWFIDrv;

	hif_drv = (struct host_if_drv *)priv->hif_drv;



	PRINT_D(GENERIC_DBG, "Mac close\n");

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+12 −10
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static void CfgConnectResult(enum conn_event enuConnDisconnEvent, 
	dev = priv->dev;

	vif = netdev_priv(dev);

	wl = vif->wilc;

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hif_drv;



	if (enuConnDisconnEvent == CONN_DISCONN_EVENT_CONN_RESP) {

		u16 u16ConnectStatus;
@@ -711,9 +711,11 @@ static int connect(struct wiphy *wiphy, struct net_device *dev, 
	wilc_connecting = 1;

	priv = wiphy_priv(wiphy);

	vif = netdev_priv(priv->dev);

	pstrWFIDrv = (struct host_if_drv *)(priv->hWILCWFIDrv);

	pstrWFIDrv = (struct host_if_drv *)priv->hif_drv;



	PRINT_D(CFG80211_DBG, "Connecting to SSID [%s] on netdev [%p] host if [%p]\n", sme->ssid, dev, priv->hWILCWFIDrv);

	PRINT_D(CFG80211_DBG,

		"Connecting to SSID [%s] on netdev [%p] host if [%p]\n",

		sme->ssid, dev, priv->hif_drv);

	if (!(strncmp(sme->ssid, "DIRECT-", 7))) {

		PRINT_D(CFG80211_DBG, "Connected to Direct network,OBSS disabled\n");

		pstrWFIDrv->p2p_connect = 1;
@@ -928,7 +930,7 @@ static int disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_co 
	priv = wiphy_priv(wiphy);

	vif = netdev_priv(priv->dev);



	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hif_drv;

	if (!pstrWFIDrv->p2p_connect)

		wlan_channel = INVALID_CHANNEL;

	wilc_wlan_set_bssid(priv->dev, NullBssid, STATION_MODE);
@@ -1276,7 +1278,7 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, 
		wilc_remove_wep_key(vif, key_index);

	} else {

		PRINT_D(CFG80211_DBG, "Removing all installed keys\n");

		wilc_remove_key(priv->hWILCWFIDrv, mac_addr);

		wilc_remove_key(priv->hif_drv, mac_addr);

	}



	return 0;
@@ -1632,7 +1634,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff, u32 size) 
	s32 s32Freq;



	priv = wiphy_priv(dev->ieee80211_ptr->wiphy);

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hif_drv;



	memcpy(&header, (buff - HOST_HDR_OFFSET), HOST_HDR_OFFSET);
@@ -1844,7 +1846,7 @@ static int mgmt_tx(struct wiphy *wiphy, 


	vif = netdev_priv(wdev->netdev);

	priv = wiphy_priv(wiphy);

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hif_drv;



	*cookie = (unsigned long)buf;

	priv->u64tx_cookie = *cookie;
@@ -1970,7 +1972,7 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy, 
	struct host_if_drv *pstrWFIDrv;



	priv = wiphy_priv(wiphy);

	pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;

	pstrWFIDrv = (struct host_if_drv *)priv->hif_drv;





	PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies);
@@ -2070,7 +2072,7 @@ static int set_power_mgmt(struct wiphy *wiphy, struct net_device *dev, 


	priv = wiphy_priv(wiphy);

	vif = netdev_priv(priv->dev);

	if (!priv->hWILCWFIDrv) {

	if (!priv->hif_drv) {

		PRINT_ER("Driver is NULL\n");

		return -EIO;

	}
@@ -2715,7 +2717,7 @@ int wilc_init_host_int(struct net_device *net) 
	priv->bInP2PlistenState = false;



	sema_init(&(priv->hSemScanReq), 1);

	s32Error = wilc_init(net, &priv->hWILCWFIDrv);

	s32Error = wilc_init(net, &priv->hif_drv);

	if (s32Error)

		PRINT_ER("Error while initializing hostinterface\n");

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ struct wilc_priv { 
	spinlock_t lock;

	struct net_device *dev;

	struct napi_struct napi;

	struct host_if_drv *hWILCWFIDrv;

	struct host_if_drv *hif_drv;

	struct host_if_pmkid_attr pmkid_list;

	struct WILC_WFI_stats netstats;

	u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];