Commit 63611670 authored Sep 24, 2015 by Glen Lee Committed by Greg Kroah-Hartman Sep 29, 2015

staging: wilc1000: remove function pointer rx_indicate



This patch removes function pointer rx_indicate and call the function
frmw_to_linux directly.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 498767e3

drivers/staging/wilc1000/linux_wlan.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -106,7 +106,6 @@ extern void WILC_WFI_monitor_rx(u8 *buff, u32 size);
		extern void WILC_WFI_p2p_rx(struct net_device dev, u8 buff, u32 size);

		static void linux_wlan_tx_complete(void *priv, int status);
		void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset);
		static int mac_init_fn(struct net_device *ndev);
		int mac_xmit(struct sk_buff skb, struct net_device dev);
		int mac_open(struct net_device *ndev);
		@@ -1095,7 +1094,6 @@ void linux_to_wlan(wilc_wlan_inp_t nwi, linux_wlan_t nic)
		#endif

		/for now - to be revised/
		nwi->net_func.rx_indicate = frmw_to_linux;
		nwi->net_func.rx_complete = linux_wlan_rx_complete;
		nwi->indicate_func.mac_indicate = linux_wlan_mac_indicate;
		}

drivers/staging/wilc1000/wilc_wfi_netdevice.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -216,5 +216,6 @@ struct WILC_WFI_mon_priv {
		};

		extern struct net_device *WILC_WFI_devs[];
		void frmw_to_linux(u8 *buff, u32 size, u32 pkt_offset);

		#endif

drivers/staging/wilc1000/wilc_wlan.c

+5 −6

Original line number	Diff line number	Diff line
		@@ -1199,13 +1199,12 @@ static void wilc_wlan_handle_rxq(void)
		{

		if (!is_cfg_packet) {

		if (p->net_func.rx_indicate) {
		if (pkt_len > 0) {
		p->net_func.rx_indicate(&buffer[offset], pkt_len, pkt_offset);
		frmw_to_linux(&buffer[offset],
		pkt_len,
		pkt_offset);
		has_packet = 1;
		}
		}
		} else {
		wilc_cfg_rsp_t rsp;

drivers/staging/wilc1000/wilc_wlan_if.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,6 @@ typedef struct {
		} wilc_wlan_io_func_t;

		typedef struct {
		void (rx_indicate)(u8 , u32, u32);
		void (*rx_complete)(void);
		} wilc_wlan_net_func_t;