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

Commit c1b30f6a authored by Tony Cho's avatar Tony Cho Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: rename u8NoIfcs in the struct wilc 



This patch renames u8NoIfcs of the struct wilc to the vif_num to avoid
CamelCase naming convention.

Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 080f11bb

drivers/staging/wilc1000/linux_wlan.c

+9 −9
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ struct net_device *GetIfHandler(u8 *pMacHeader) 
	Bssid  = pMacHeader + 10;

	Bssid1 = pMacHeader + 4;



	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

	for (i = 0; i < g_linux_wlan->vif_num; i++) {

		if (!memcmp(Bssid1, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN) ||

		    !memcmp(Bssid, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN))	{

			return g_linux_wlan->strInterfaceInfo[i].wilc_netdev;
@@ -377,7 +377,7 @@ struct net_device *GetIfHandler(u8 *pMacHeader) 
		PRINT_D(INIT_DBG, "%02x ", pMacHeader[i]);

	Bssid  = pMacHeader + 18;

	Bssid1 = pMacHeader + 12;

	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

	for (i = 0; i < g_linux_wlan->vif_num; i++) {

		if (!memcmp(Bssid1, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN) ||

		    !memcmp(Bssid, g_linux_wlan->strInterfaceInfo[i].aBSSID, ETH_ALEN))	{

			PRINT_D(INIT_DBG, "Ctx [%p]\n", g_linux_wlan->strInterfaceInfo[i].wilc_netdev);
@@ -394,7 +394,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID) 
	int ret = -1;



	PRINT_D(INIT_DBG, "set bssid on[%p]\n", wilc_netdev);

	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

	for (i = 0; i < g_linux_wlan->vif_num; i++) {

		if (g_linux_wlan->strInterfaceInfo[i].wilc_netdev == wilc_netdev) {

			PRINT_D(INIT_DBG, "set bssid [%x][%x][%x]\n", pBSSID[0], pBSSID[1], pBSSID[2]);

			memcpy(g_linux_wlan->strInterfaceInfo[i].aBSSID, pBSSID, 6);
@@ -412,7 +412,7 @@ int linux_wlan_get_num_conn_ifcs(void) 
	u8 null_bssid[6] = {0};

	u8 ret_val = 0;



	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

	for (i = 0; i < g_linux_wlan->vif_num; i++) {

		if (memcmp(g_linux_wlan->strInterfaceInfo[i].aBSSID, null_bssid, 6))

			ret_val++;

	}
@@ -1316,7 +1316,7 @@ int mac_open(struct net_device *ndev) 
	PRINT_D(INIT_DBG, "Mac address: %pM\n", mac_add);



	/* loop through the NUM of supported devices and set the MAC address */

	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

	for (i = 0; i < g_linux_wlan->vif_num; i++) {

		if (ndev == g_linux_wlan->strInterfaceInfo[i].wilc_netdev) {

			memcpy(g_linux_wlan->strInterfaceInfo[i].aSrcAddress, mac_add, ETH_ALEN);

			g_linux_wlan->strInterfaceInfo[i].drvHandler = priv->hWILCWFIDrv;
@@ -1687,7 +1687,7 @@ void WILC_WFI_mgmt_rx(u8 *buff, u32 size) 


	/*Pass the frame on the monitor interface, if any.*/

	/*Otherwise, pass it on p2p0 netdev, if registered on it*/

	for (i = 0; i < g_linux_wlan->u8NoIfcs; i++) {

	for (i = 0; i < g_linux_wlan->vif_num; i++) {

		nic = netdev_priv(g_linux_wlan->strInterfaceInfo[i].wilc_netdev);

		if (nic->monitor_flag) {

			WILC_WFI_monitor_rx(buff, size);
@@ -1740,10 +1740,10 @@ int wilc_netdev_init(void) 
		} else

			strcpy(ndev->name, "p2p%d");



		nic->u8IfIdx = g_linux_wlan->u8NoIfcs;

		nic->u8IfIdx = g_linux_wlan->vif_num;

		nic->wilc_netdev = ndev;

		g_linux_wlan->strInterfaceInfo[g_linux_wlan->u8NoIfcs].wilc_netdev = ndev;

		g_linux_wlan->u8NoIfcs++;

		g_linux_wlan->strInterfaceInfo[g_linux_wlan->vif_num].wilc_netdev = ndev;

		g_linux_wlan->vif_num++;

		ndev->netdev_ops = &wilc_netdev_ops;



		{

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ struct wilc { 
	unsigned short dev_irq_num;

	#endif

	int close;

	u8 u8NoIfcs;

	u8 vif_num;

	struct wilc_vif strInterfaceInfo[NUM_CONCURRENT_IFC];

	u8 open_ifcs;