mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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: Glen Lee <glen.lee@atmel.com> Signed-off-by: Tony Cho <tony.cho@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
8cec741e4a
commit
8fc84a6f64
4 changed files with 7 additions and 7 deletions
|
@ -1563,10 +1563,9 @@ 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,
|
||||
tx_data->size,
|
||||
linux_wlan_tx_complete);
|
||||
QueueCount = wilc_wlan_txq_add_net_pkt((void *)tx_data, tx_data->buff,
|
||||
tx_data->size,
|
||||
linux_wlan_tx_complete);
|
||||
|
||||
if (QueueCount > FLOW_CONTROL_UPPER_THRESHOLD) {
|
||||
netif_stop_queue(g_linux_wlan->strInterfaceInfo[0].wilc_netdev);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue