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

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

staging: wilc1000: remove function pointer wlan_add_to_tx_que 



This patch removes function pointer wlan_add_to_tx_que and just call
the function wilc_wlan_txq_add_net_pkt. Remove static from the function also.

Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarTony Cho <tony.cho@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8cec741e

drivers/staging/wilc1000/linux_wlan.c

+3 −4
Original line number Diff line number Diff line
@@ -1563,8 +1563,7 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev) 
	nic->netstats.tx_packets++;

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

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

	QueueCount = g_linux_wlan->oup.wlan_add_to_tx_que((void *)tx_data,

							  tx_data->buff,

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

					       tx_data->size,

					       linux_wlan_tx_complete);

drivers/staging/wilc1000/wilc_wlan.c

+2 −2
Original line number Diff line number Diff line
@@ -503,7 +503,8 @@ static int wilc_wlan_txq_add_cfg_pkt(u8 *buffer, u32 buffer_size) 
	return 1;

}



static int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size, wilc_tx_complete_func_t func)

int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size,

			      wilc_tx_complete_func_t func)

{

	wilc_wlan_dev_t *p = (wilc_wlan_dev_t *)&g_wlan;

	struct txq_entry_t *tqe;
@@ -2027,7 +2028,6 @@ int wilc_wlan_init(wilc_wlan_inp_t *inp, wilc_wlan_oup_t *oup) 
	/**

	 *      export functions

	 **/

	oup->wlan_add_to_tx_que = wilc_wlan_txq_add_net_pkt;

	oup->wlan_handle_tx_que = wilc_wlan_handle_txq;

	oup->wlan_handle_rx_isr = wilc_handle_isr;

	oup->wlan_cleanup = wilc_wlan_cleanup;

drivers/staging/wilc1000/wilc_wlan.h

+2 −0
Original line number Diff line number Diff line
@@ -308,4 +308,6 @@ typedef struct { 
int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size);

int wilc_wlan_start(void);

int wilc_wlan_stop(void);

int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size,

			      wilc_tx_complete_func_t func);

#endif

drivers/staging/wilc1000/wilc_wlan_if.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ typedef void (*wilc_tx_complete_func_t)(void *, int); 
#define WILC_TX_ERR_NO_BUF	(-2)



typedef struct {

	int (*wlan_add_to_tx_que)(void *, u8 *, u32, wilc_tx_complete_func_t);

	int (*wlan_handle_tx_que)(u32 *);

	void (*wlan_handle_rx_isr)(void);

	void (*wlan_cleanup)(void);