提交 691bbd42 编写于 作者: G Glen Lee 提交者: Greg Kroah-Hartman

staging: wilc1000: wilc_wlan_txq_add_net_pkt: add argument struct net_device

This patch add new argument struct net_device *dev and pass net_device to
wilc_wlan_txq_add_net_pkt.
Signed-off-by: NGlen Lee <glen.lee@atmel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 b7495be5
...@@ -1413,8 +1413,8 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev) ...@@ -1413,8 +1413,8 @@ int mac_xmit(struct sk_buff *skb, struct net_device *ndev)
nic->netstats.tx_packets++; nic->netstats.tx_packets++;
nic->netstats.tx_bytes += tx_data->size; nic->netstats.tx_bytes += tx_data->size;
tx_data->pBssid = wilc->vif[nic->u8IfIdx].bssid; tx_data->pBssid = wilc->vif[nic->u8IfIdx].bssid;
QueueCount = wilc_wlan_txq_add_net_pkt((void *)tx_data, tx_data->buff, QueueCount = wilc_wlan_txq_add_net_pkt(ndev, (void *)tx_data,
tx_data->size, tx_data->buff, tx_data->size,
linux_wlan_tx_complete); linux_wlan_tx_complete);
if (QueueCount > FLOW_CONTROL_UPPER_THRESHOLD) { if (QueueCount > FLOW_CONTROL_UPPER_THRESHOLD) {
......
...@@ -502,8 +502,8 @@ static int wilc_wlan_txq_add_cfg_pkt(u8 *buffer, u32 buffer_size) ...@@ -502,8 +502,8 @@ static int wilc_wlan_txq_add_cfg_pkt(u8 *buffer, u32 buffer_size)
return 1; return 1;
} }
int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size, int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,
wilc_tx_complete_func_t func) u32 buffer_size, wilc_tx_complete_func_t func)
{ {
wilc_wlan_dev_t *p = &g_wlan; wilc_wlan_dev_t *p = &g_wlan;
struct txq_entry_t *tqe; struct txq_entry_t *tqe;
......
...@@ -298,8 +298,8 @@ typedef struct { ...@@ -298,8 +298,8 @@ typedef struct {
int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size); int wilc_wlan_firmware_download(const u8 *buffer, u32 buffer_size);
int wilc_wlan_start(void); int wilc_wlan_start(void);
int wilc_wlan_stop(void); int wilc_wlan_stop(void);
int wilc_wlan_txq_add_net_pkt(void *priv, u8 *buffer, u32 buffer_size, int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,
wilc_tx_complete_func_t func); u32 buffer_size, wilc_tx_complete_func_t func);
int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount); int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount);
void wilc_handle_isr(void *wilc); void wilc_handle_isr(void *wilc);
void wilc_wlan_cleanup(struct net_device *dev); void wilc_wlan_cleanup(struct net_device *dev);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册