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

Commit 64f2b71b authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: linux_wlan_mac_indicate: add argument and use wilc 



This patch adds argument wilc and pass the function wilc. Use wilc instead of
g_linux_wlan and pd.

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

drivers/staging/wilc1000/linux_wlan.c

+6 −7
Original line number Diff line number Diff line
@@ -348,24 +348,23 @@ int linux_wlan_lock_timeout(void *vp, u32 timeout) 
	return error;

}



void linux_wlan_mac_indicate(int flag)

void linux_wlan_mac_indicate(struct wilc *wilc, int flag)

{

	/*I have to do it that way becuase there is no mean to encapsulate device pointer

	 * as a parameter

	 */

	struct wilc *pd = g_linux_wlan;

	int status;



	if (flag == WILC_MAC_INDICATE_STATUS) {

		wilc_wlan_cfg_get_val(WID_STATUS, (unsigned char *)&status, 4);

		if (pd->mac_status == WILC_MAC_STATUS_INIT) {

			pd->mac_status = status;

			up(&pd->sync_event);

		if (wilc->mac_status == WILC_MAC_STATUS_INIT) {

			wilc->mac_status = status;

			up(&wilc->sync_event);

		} else {

			pd->mac_status = status;

			wilc->mac_status = status;

		}



		if (pd->mac_status == WILC_MAC_STATUS_CONNECT) {        /* Connect */

		if (wilc->mac_status == WILC_MAC_STATUS_CONNECT) {        /* Connect */

		}



	} else if (flag == WILC_MAC_INDICATE_SCAN) {

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct WILC_WFI_mon_priv { 
extern struct wilc *g_linux_wlan;

extern struct net_device *WILC_WFI_devs[];

void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset);

void linux_wlan_mac_indicate(int flag);

void linux_wlan_mac_indicate(struct wilc *wilc, int flag);

void linux_wlan_rx_complete(void);

void linux_wlan_dbg(u8 *buff);

int linux_wlan_lock_timeout(void *vp, u32 timeout);

drivers/staging/wilc1000/wilc_wlan.c

+2 −2
Original line number Diff line number Diff line
@@ -1199,10 +1199,10 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc) 
						/**

						 *      Call back to indicate status...

						 **/

						linux_wlan_mac_indicate(WILC_MAC_INDICATE_STATUS);

						linux_wlan_mac_indicate(wilc, WILC_MAC_INDICATE_STATUS);



					} else if (rsp.type == WILC_CFG_RSP_SCAN) {

						linux_wlan_mac_indicate(WILC_MAC_INDICATE_SCAN);

						linux_wlan_mac_indicate(wilc, WILC_MAC_INDICATE_SCAN);

					}

				}

			}