Commit 829c477f authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

staging: wilc1000: wilc_wlan_txq_add_mgmt_pkt: add new argument dev

This patch adds new argument struct net_device *dev and pass argument
struct net_device to the function.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 718fc2c9
...@@ -195,7 +195,7 @@ static int mon_mgmt_tx(struct net_device *dev, const u8 *buf, size_t len) ...@@ -195,7 +195,7 @@ static int mon_mgmt_tx(struct net_device *dev, const u8 *buf, size_t len)
mgmt_tx->size = len; mgmt_tx->size = len;
memcpy(mgmt_tx->buff, buf, len); memcpy(mgmt_tx->buff, buf, len);
wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff, mgmt_tx->size, wilc_wlan_txq_add_mgmt_pkt(dev, mgmt_tx, mgmt_tx->buff, mgmt_tx->size,
mgmt_tx_complete); mgmt_tx_complete);
netif_wake_queue(dev); netif_wake_queue(dev);
......
...@@ -2337,8 +2337,8 @@ static int mgmt_tx(struct wiphy *wiphy, ...@@ -2337,8 +2337,8 @@ static int mgmt_tx(struct wiphy *wiphy,
jiffies, pstrWFIDrv->p2p_timeout); jiffies, pstrWFIDrv->p2p_timeout);
} }
wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff, wilc_wlan_txq_add_mgmt_pkt(wdev->netdev, mgmt_tx,
mgmt_tx->size, mgmt_tx->buff, mgmt_tx->size,
WILC_WFI_mgmt_tx_complete); WILC_WFI_mgmt_tx_complete);
} else { } else {
PRINT_D(GENERIC_DBG, "This function transmits only management frames\n"); PRINT_D(GENERIC_DBG, "This function transmits only management frames\n");
......
...@@ -543,7 +543,8 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer, ...@@ -543,7 +543,8 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,
return p->txq_entries; return p->txq_entries;
} }
int wilc_wlan_txq_add_mgmt_pkt(void *priv, u8 *buffer, u32 buffer_size, wilc_tx_complete_func_t func) int wilc_wlan_txq_add_mgmt_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; wilc_wlan_dev_t *p = &g_wlan;
......
...@@ -307,6 +307,6 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size, ...@@ -307,6 +307,6 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
int commit, u32 drvHandler); int commit, u32 drvHandler);
int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler); int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler);
int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size); int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size);
int wilc_wlan_txq_add_mgmt_pkt(void *priv, u8 *buffer, u32 buffer_size, int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,
wilc_tx_complete_func_t func); u32 buffer_size, wilc_tx_complete_func_t func);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment