Commit 2ad8c47d authored by Leo Kim's avatar Leo Kim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename Set_machw_change_vir_if function 



This patch rename Set_machw_change_vir_if function to set_machw_change_vir_if
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 339d244a

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ int mac_open(struct net_device *ndev) 
		return ret;

	}



	Set_machw_change_vir_if(ndev, 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 −3
Original line number Diff line number Diff line
@@ -1408,7 +1408,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(netdev, false);

		set_machw_change_vir_if(netdev, false);

	}



	if (key_index >= 0 && key_index <= 3) {
@@ -2548,7 +2548,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(dev, true);

		set_machw_change_vir_if(dev, true);

	}



	switch (type) {
@@ -2710,7 +2710,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(dev, 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 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ void wl_wlan_cleanup(struct wilc *wilc); 
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);

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

int linux_wlan_get_firmware(struct net_device *dev);

int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *bssid);

#endif

drivers/staging/wilc1000/wilc_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -2052,7 +2052,7 @@ int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp) 


}



u16 Set_machw_change_vir_if(struct net_device *dev, bool bValue)

u16 set_machw_change_vir_if(struct net_device *dev, bool bValue)

{

	u16 ret;

	u32 reg;