diff options
| author | Glen Lee <glen.lee@atmel.com> | 2015-10-27 18:28:02 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-29 08:11:23 +0900 |
| commit | 691bbd42b0dde916e489ee71babfa17bab32720e (patch) | |
| tree | 39a28c9e8e381d97d4b951d9f17aa92c53f79688 /drivers/staging/wilc1000 | |
| parent | b7495be52a25b7136aa437262a7e04d41d7afdde (diff) | |
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: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/linux_wlan.c | 4 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.c | 4 | ||||
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wlan.h | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c index 9a105cebc835..2a5b36fd8b48 100644 --- a/drivers/staging/wilc1000/linux_wlan.c +++ b/drivers/staging/wilc1000/linux_wlan.c @@ -1413,8 +1413,8 @@ 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 = wilc->vif[nic->u8IfIdx].bssid; - QueueCount = wilc_wlan_txq_add_net_pkt((void *)tx_data, tx_data->buff, - tx_data->size, + QueueCount = wilc_wlan_txq_add_net_pkt(ndev, (void *)tx_data, + tx_data->buff, tx_data->size, linux_wlan_tx_complete); if (QueueCount > FLOW_CONTROL_UPPER_THRESHOLD) { diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c index b109289393c3..14a56d69c665 100644 --- a/drivers/staging/wilc1000/wilc_wlan.c +++ b/drivers/staging/wilc1000/wilc_wlan.c @@ -502,8 +502,8 @@ static int wilc_wlan_txq_add_cfg_pkt(u8 *buffer, u32 buffer_size) return 1; } -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(struct net_device *dev, void *priv, u8 *buffer, + u32 buffer_size, wilc_tx_complete_func_t func) { wilc_wlan_dev_t *p = &g_wlan; struct txq_entry_t *tqe; diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h index d0b244848cc4..57e1d5174050 100644 --- a/drivers/staging/wilc1000/wilc_wlan.h +++ b/drivers/staging/wilc1000/wilc_wlan.h @@ -298,8 +298,8 @@ 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); +int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer, + u32 buffer_size, wilc_tx_complete_func_t func); int wilc_wlan_handle_txq(struct net_device *dev, u32 *pu32TxqCount); void wilc_handle_isr(void *wilc); void wilc_wlan_cleanup(struct net_device *dev); |