Commit 178c383f authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: Set_machw_change_vir_if: add argument struct net_device 



Add new argument net_device and use netdev private data member wilc
instead of g_linux_wlan. Pass argument dev to the function as well.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4ad81fd6

drivers/staging/wilc1000/linux_wlan.c

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#endif



extern bool g_obtainingIP;

extern u16 Set_machw_change_vir_if(bool bValue);

extern void resolve_disconnect_aberration(void *drvHandler);

extern u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];

extern struct timer_list hDuringIpTimer;
@@ -1244,7 +1243,7 @@ int mac_open(struct net_device *ndev) 
		return ret;

	}



	Set_machw_change_vir_if(false);

	Set_machw_change_vir_if(ndev, false);



	host_int_get_MacAddress(priv->hWILCWFIDrv, mac_add);

	PRINT_D(INIT_DBG, "Mac address: %pM\n", mac_add);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+3 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#define GET_PKT_OFFSET(a) (((a) >> 22) & 0x1ff)



extern int linux_wlan_get_firmware(perInterface_wlan_t *p_nic);

extern u16 Set_machw_change_vir_if(bool bValue);



extern int mac_open(struct net_device *ndev);

extern int mac_close(struct net_device *ndev);
@@ -1413,7 +1412,7 @@ static int del_key(struct wiphy *wiphy, struct net_device *netdev, 
		g_key_gtk_params.seq = NULL;



		/*Reset WILC_CHANGING_VIR_IF register to allow adding futrue keys to CE H/W*/

		Set_machw_change_vir_if(false);

		Set_machw_change_vir_if(netdev, false);

	}



	if (key_index >= 0 && key_index <= 3) {
@@ -2562,7 +2561,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
	PRINT_D(GENERIC_DBG, "Changing virtual interface, enable scan\n");

	/*Set WILC_CHANGING_VIR_IF register to disallow adding futrue keys to CE H/W*/

	if (g_ptk_keys_saved && g_gtk_keys_saved) {

		Set_machw_change_vir_if(true);

		Set_machw_change_vir_if(dev, true);

	}



	switch (type) {
@@ -2724,7 +2723,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 


			/*Refresh scan, to refresh the scan results to the wpa_supplicant. Set MachHw to false to enable further key installments*/

			refresh_scan(priv, 1, true);

			Set_machw_change_vir_if(false);

			Set_machw_change_vir_if(dev, false);



			if (wl->initialized)	{

				for (i = 0; i < num_reg_frame; i++) {

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -217,4 +217,5 @@ void wl_wlan_cleanup(void); 
int wilc_netdev_init(struct wilc **wilc);

void wilc1000_wlan_deinit(struct net_device *dev);

void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);

u16 Set_machw_change_vir_if(struct net_device *dev, bool bValue);

#endif

drivers/staging/wilc1000/wilc_wlan.c

+8 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
extern wilc_hif_func_t hif_sdio;

extern wilc_hif_func_t hif_spi;

u32 wilc_get_chipid(u8 update);

u16 Set_machw_change_vir_if(bool bValue);
@@ -2033,13 +2032,18 @@ _fail_: 


}



u16 Set_machw_change_vir_if(bool bValue)

u16 Set_machw_change_vir_if(struct net_device *dev, bool bValue)

{

	u16 ret;

	u32 reg;

	perInterface_wlan_t *nic;

	struct wilc *wilc;



	nic = netdev_priv(dev);

	wilc = nic->wilc;



	/*Reset WILC_CHANGING_VIR_IF register to allow adding futrue keys to CE H/W*/

	mutex_lock(&g_linux_wlan->hif_cs);

	mutex_lock(&wilc->hif_cs);

	ret = (&g_wlan)->hif_func.hif_read_reg(WILC_CHANGING_VIR_IF, &reg);

	if (!ret)

		PRINT_ER("Error while Reading reg WILC_CHANGING_VIR_IF\n");
@@ -2054,7 +2058,7 @@ u16 Set_machw_change_vir_if(bool bValue) 
	if (!ret)

		PRINT_ER("Error while writing reg WILC_CHANGING_VIR_IF\n");



	mutex_unlock(&g_linux_wlan->hif_cs);

	mutex_unlock(&wilc->hif_cs);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE