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

staging: wilc1000: frmw_to_linux: add argument struct wilc 



This patch adds new argument struct wilc and use it instead of
g_linux_wlan. Pass argument wilc to the function as well.

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

drivers/staging/wilc1000/linux_wlan.c

+3 −3
Original line number Diff line number Diff line
@@ -1557,7 +1557,7 @@ done: 
	return s32Error;

}



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

void frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset)

{



	unsigned int frame_len = 0;
@@ -1586,8 +1586,8 @@ void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset) 
			return;

		}



		if (g_linux_wlan == NULL || wilc_netdev == NULL)

			PRINT_ER("wilc_netdev in g_linux_wlan is NULL");

		if (wilc == NULL || wilc_netdev == NULL)

			PRINT_ER("wilc_netdev in wilc is NULL");

		skb->dev = wilc_netdev;



		if (skb->dev == NULL)

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,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 frmw_to_linux(struct wilc *wilc, u8 *buff, u32 size, u32 pkt_offset);

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

void linux_wlan_rx_complete(void);

void linux_wlan_dbg(u8 *buff);

drivers/staging/wilc1000/wilc_wlan.c

+2 −1
Original line number Diff line number Diff line
@@ -1184,7 +1184,8 @@ static void wilc_wlan_handle_rxq(struct wilc *wilc) 


				if (!is_cfg_packet) {

					if (pkt_len > 0) {

						frmw_to_linux(&buffer[offset],

						frmw_to_linux(wilc,

							      &buffer[offset],

							      pkt_len,

							      pkt_offset);

						has_packet = 1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE