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: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c
index 450af1b77f991369fea3a8262d7566fba3c7a58e..589a11fd977c3be0f2d32829b9d452253e1d6291 100644 (file)
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -195,7 +195,7 @@ static int mon_mgmt_tx(struct net_device *dev, const u8 *buf, size_t len)
        mgmt_tx->size = 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);
 
        netif_wake_queue(dev);

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 4de27ef5b6e4990e48e8753f46447eb90e0185f3..cdcf134c314a300e500b35fd7880ae8c4825e9da 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2337,8 +2337,8 @@ static int mgmt_tx(struct wiphy *wiphy,
                                jiffies, pstrWFIDrv->p2p_timeout);
                }
 
-               wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff,
-                                          mgmt_tx->size,
+               wilc_wlan_txq_add_mgmt_pkt(wdev->netdev, mgmt_tx,
+                                          mgmt_tx->buff, mgmt_tx->size,
                                           WILC_WFI_mgmt_tx_complete);
        } else {
                PRINT_D(GENERIC_DBG, "This function transmits only management frames\n");

diff --git a/drivers/staging/wilc1000/wilc_wlan.c b/drivers/staging/wilc1000/wilc_wlan.c
index 5dcc4d21fa313bdd3895f241e8631f371e78f823..3dc0a80275ba565a3e3c7c0ea0c81e98840f7972 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -543,7 +543,8 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,
        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;

diff --git a/drivers/staging/wilc1000/wilc_wlan.h b/drivers/staging/wilc1000/wilc_wlan.h
index 57e1d51740502ea6f3c97d9331540c6ab30bd32e..2eb7e207b3abe31b9d7a93dc1cb135d16a8aede6 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -307,6 +307,6 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32 buffer_size,
                      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_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);
 #endif