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

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

staging: wilc1000: rename drvHandler in the struct wilc_vif 



This patch renames drvHandler in the struct wilc_vif to the hif_drv.

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

drivers/staging/wilc1000/linux_wlan.c

+1 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ int mac_open(struct net_device *ndev) 
	for (i = 0; i < g_linux_wlan->vif_num; i++) {

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

			memcpy(g_linux_wlan->vif[i].src_addr, mac_add, ETH_ALEN);

			g_linux_wlan->vif[i].drvHandler = priv->hWILCWFIDrv;

			g_linux_wlan->vif[i].hif_drv = priv->hWILCWFIDrv;

			break;

		}

	}

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+12 −12
Original line number Diff line number Diff line
@@ -2585,16 +2585,16 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
			nic->iftype = interface_type;



			/*Setting interface 1 drv handler and mac address in newly downloaded FW*/

			host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].drvHandler);

			host_int_set_MacAddress(g_linux_wlan->vif[0].drvHandler,

			host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv);

			host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv,

						g_linux_wlan->vif[0].src_addr);

			host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE);



			/*Add saved WEP keys, if any*/

			if (g_wep_keys_saved) {

				host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].drvHandler,

				host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv,

							     g_key_wep_params.key_idx);

				host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].drvHandler,

				host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv,

							     g_key_wep_params.key,

							     g_key_wep_params.key_len,

							     g_key_wep_params.key_idx);
@@ -2666,16 +2666,16 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 
			wilc1000_wlan_init(dev, nic);

			g_wilc_initialized = 1;



			host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].drvHandler);

			host_int_set_MacAddress(g_linux_wlan->vif[0].drvHandler,

			host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv);

			host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv,

						g_linux_wlan->vif[0].src_addr);

			host_int_set_operation_mode(priv->hWILCWFIDrv, STATION_MODE);



			/*Add saved WEP keys, if any*/

			if (g_wep_keys_saved) {

				host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].drvHandler,

				host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv,

							     g_key_wep_params.key_idx);

				host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].drvHandler,

				host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv,

							     g_key_wep_params.key,

							     g_key_wep_params.key_len,

							     g_key_wep_params.key_idx);
@@ -2781,16 +2781,16 @@ static int change_virtual_intf(struct wiphy *wiphy, struct net_device *dev, 




		/*Setting interface 1 drv handler and mac address in newly downloaded FW*/

		host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].drvHandler);

		host_int_set_MacAddress(g_linux_wlan->vif[0].drvHandler,

		host_int_set_wfi_drv_handler(g_linux_wlan->vif[0].hif_drv);

		host_int_set_MacAddress(g_linux_wlan->vif[0].hif_drv,

					g_linux_wlan->vif[0].src_addr);

		host_int_set_operation_mode(priv->hWILCWFIDrv, AP_MODE);



		/*Add saved WEP keys, if any*/

		if (g_wep_keys_saved) {

			host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].drvHandler,

			host_int_set_WEPDefaultKeyID(g_linux_wlan->vif[0].hif_drv,

						     g_key_wep_params.key_idx);

			host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].drvHandler,

			host_int_add_wep_key_bss_sta(g_linux_wlan->vif[0].hif_drv,

						     g_key_wep_params.key,

						     g_key_wep_params.key_len,

						     g_key_wep_params.key_idx);

drivers/staging/wilc1000/wilc_wfi_netdevice.h

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

	u8 src_addr[ETH_ALEN];

	u8 bssid[ETH_ALEN];

	struct host_if_drv *drvHandler;

	struct host_if_drv *hif_drv;

	struct net_device *wilc_netdev;

};