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

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

staging: wilc1000: rename aBSSID in the sturct wilc_vif 



This patch renames aBSSID in the struct wilc_vif to the bssid.

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

drivers/staging/wilc1000/linux_wlan.c

+7 −7
Original line number Diff line number Diff line
@@ -367,8 +367,8 @@ struct net_device *GetIfHandler(u8 *pMacHeader) 
	Bssid1 = pMacHeader + 4;



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

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

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

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

		    !memcmp(Bssid, g_linux_wlan->vif[i].bssid, ETH_ALEN))

			return g_linux_wlan->vif[i].wilc_netdev;



	PRINT_INFO(INIT_DBG, "Invalide handle\n");
@@ -377,8 +377,8 @@ struct net_device *GetIfHandler(u8 *pMacHeader) 
	Bssid  = pMacHeader + 18;

	Bssid1 = pMacHeader + 12;

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

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

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

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

		    !memcmp(Bssid, g_linux_wlan->vif[i].bssid, ETH_ALEN))

			return g_linux_wlan->vif[i].wilc_netdev;



	PRINT_INFO(INIT_DBG, "\n");
@@ -392,7 +392,7 @@ int linux_wlan_set_bssid(struct net_device *wilc_netdev, u8 *pBSSID) 


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

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

			memcpy(g_linux_wlan->vif[i].aBSSID, pBSSID, 6);

			memcpy(g_linux_wlan->vif[i].bssid, pBSSID, 6);

			ret = 0;

			break;

		}
@@ -408,7 +408,7 @@ int linux_wlan_get_num_conn_ifcs(void) 
	u8 ret_val = 0;



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

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

		if (memcmp(g_linux_wlan->vif[i].bssid, null_bssid, 6))

			ret_val++;



	return ret_val;
@@ -1472,7 +1472,7 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev) 
	PRINT_D(TX_DBG, "Adding tx packet to TX Queue\n");

	nic->netstats.tx_packets++;

	nic->netstats.tx_bytes += tx_data->size;

	tx_data->pBssid = g_linux_wlan->vif[nic->u8IfIdx].aBSSID;

	tx_data->pBssid = g_linux_wlan->vif[nic->u8IfIdx].bssid;

	QueueCount = wilc_wlan_txq_add_net_pkt((void *)tx_data, tx_data->buff,

					       tx_data->size,

					       linux_wlan_tx_complete);

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+3 −3
Original line number Diff line number Diff line
@@ -2572,7 +2572,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
		nic->iftype = STATION_MODE;



		if (g_linux_wlan->initialized) {

			host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].aBSSID, TID);

			host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID);

			/* ensure that the message Q is empty */

			host_int_wait_msg_queue_idle();
@@ -2648,7 +2648,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
		connecting = 0;

		PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_P2P_CLIENT\n");



		host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].aBSSID, TID);

		host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID);



		dev->ieee80211_ptr->iftype = type;

		priv->wdev->iftype = type;
@@ -2760,7 +2760,7 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
		/*sent before downloading new FW. This is because it blocks on*/

		/*hWaitResponse semaphore, which allows previous config*/

		/*packets to actually take action on old FW*/

		host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].aBSSID, TID);

		host_int_del_All_Rx_BASession(priv->hWILCWFIDrv, g_linux_wlan->vif[0].bssid, TID);

		bEnablePS = false;

		PRINT_D(HOSTAPD_DBG, "Interface type = NL80211_IFTYPE_GO\n");

		dev->ieee80211_ptr->iftype = type;

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ typedef struct { 


struct wilc_vif {

	u8 src_addr[ETH_ALEN];

	u8 aBSSID[ETH_ALEN];

	u8 bssid[ETH_ALEN];

	struct host_if_drv *drvHandler;

	struct net_device *wilc_netdev;

};