staging: wilc1000: rename u8RemainOnChan_pendingreq of struct host_if_drv

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / linux_mon.c

diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c
index af5d0f5f065abe62231c8c71a80618d01743f065..450af1b77f991369fea3a8262d7566fba3c7a58e 100644 (file)
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -11,7 +11,6 @@
 #include "wilc_wlan_if.h"
 #include "wilc_wlan.h"
 
-#ifdef WILC_AP_EXTERNAL_MLME
 
 struct wilc_wfi_radiotap_hdr {
        struct ieee80211_radiotap_header hdr;
@@ -25,8 +24,6 @@ struct wilc_wfi_radiotap_cb_hdr {
        u16 tx_flags;
 } __attribute__((packed));
 
-extern linux_wlan_t *g_linux_wlan;
-
 static struct net_device *wilc_wfi_mon; /* global monitor netdev */
 
 extern int  mac_xmit(struct sk_buff *skb, struct net_device *dev);
@@ -61,7 +58,6 @@ void WILC_WFI_monitor_rx(u8 *buff, u32 size)
 
        PRINT_INFO(HOSTAPD_DBG, "In monitor interface receive function\n");
 
-       /* Bug 4601 */
        if (wilc_wfi_mon == NULL)
                return;
 
@@ -199,7 +195,8 @@ 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);
-       g_linux_wlan->oup.wlan_add_mgmt_to_tx_que(mgmt_tx, mgmt_tx->buff, mgmt_tx->size, mgmt_tx_complete);
+       wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff, mgmt_tx->size,
+                                  mgmt_tx_complete);
 
        netif_wake_queue(dev);
        return 0;
@@ -223,7 +220,6 @@ static netdev_tx_t WILC_WFI_mon_xmit(struct sk_buff *skb,
        struct sk_buff *skb2;
        struct wilc_wfi_radiotap_cb_hdr *cb_hdr;
 
-       /* Bug 4601 */
        if (wilc_wfi_mon == NULL)
                return -EFAULT;
 
@@ -312,32 +308,6 @@ static const struct net_device_ops wilc_wfi_netdev_ops = {
 
 };
 
-/**
- *  @brief      WILC_WFI_mon_setup
- *  @details
- *  @param[in]
- *  @return     int : Return 0 on Success
- *  @author    mdaftedar
- *  @date      12 JUL 2012
- *  @version   1.0
- */
-static void WILC_WFI_mon_setup(struct net_device *dev)
-{
-
-       dev->netdev_ops = &wilc_wfi_netdev_ops;
-       PRINT_INFO(CORECONFIG_DBG, "In Ethernet setup function\n");
-       ether_setup(dev);
-       dev->priv_flags |= IFF_NO_QUEUE;
-       dev->type = ARPHRD_IEEE80211_RADIOTAP;
-       eth_zero_addr(dev->dev_addr);
-
-       {
-               unsigned char mac_add[] = {0x00, 0x50, 0xc2, 0x5e, 0x10, 0x8f};
-               memcpy(dev->dev_addr, mac_add, ETH_ALEN);
-       }
-
-}
-
 /**
  *  @brief      WILC_WFI_init_mon_interface
  *  @details
@@ -419,4 +389,3 @@ int WILC_WFI_deinit_mon_interface(void)
        return 0;
 
 }
-#endif /* WILC_AP_EXTERNAL_MLME */