Staging: rt2870: remove dead BLOCK_NET_IF code

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/rt2870/common/cmm_data.c b/drivers/staging/rt2870/common/cmm_data.c
index f8e0ebd..55e0e9c 100644 (file)
--- a/drivers/staging/rt2870/common/cmm_data.c
+++ b/drivers/staging/rt2870/common/cmm_data.c
@@ -940,15 +940,6 @@ VOID RTMPDeQueuePacket(
                if (!hasTxDesc)
                        RTUSBKickBulkOut(pAd);
 #endif // RT2870 //
-
-#ifdef BLOCK_NET_IF
-               if ((pAd->blockQueueTab[QueIdx].SwTxQueueBlockFlag == TRUE)
-                       && (pAd->TxSwQueue[QueIdx].Number < 1))
-               {
-                       releaseNetIf(&pAd->blockQueueTab[QueIdx]);
-               }
-#endif // BLOCK_NET_IF //
-
        }
 
 }

diff --git a/drivers/staging/rt2870/common/netif_block.c b/drivers/staging/rt2870/common/netif_block.c
deleted file mode 100644 (file)
index b637a1a..0000000
--- a/drivers/staging/rt2870/common/netif_block.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- *************************************************************************
- * Ralink Tech Inc.
- * 5F., No.36, Taiyuan St., Jhubei City,
- * Hsinchu County 302,
- * Taiwan, R.O.C.
- *
- * (c) Copyright 2002-2007, Ralink Technology, Inc.
- *
- * This program is free software; you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation; either version 2 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * This program is distributed in the hope that it will be useful,       *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- * GNU General Public License for more details.                          *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program; if not, write to the                         *
- * Free Software Foundation, Inc.,                                       *
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- *                                                                       *
- *************************************************************************
- */
-
-#include "../rt_config.h"
-#include "netif_block.h"
-
-static NETIF_ENTRY freeNetIfEntryPool[FREE_NETIF_POOL_SIZE];
-static LIST_HEADER freeNetIfEntryList;
-
-void initblockQueueTab(
-       IN PRTMP_ADAPTER pAd)
-{
-       int i;
-
-       initList(&freeNetIfEntryList);
-       for (i = 0; i < FREE_NETIF_POOL_SIZE; i++)
-               insertTailList(&freeNetIfEntryList, (PLIST_ENTRY)&freeNetIfEntryPool[i]);
-
-       for (i=0; i < NUM_OF_TX_RING; i++)
-               initList(&pAd->blockQueueTab[i].NetIfList);
-
-       return;
-}
-
-BOOLEAN blockNetIf(
-       IN PBLOCK_QUEUE_ENTRY pBlockQueueEntry,
-       IN PNET_DEV pNetDev)
-{
-       PNETIF_ENTRY pNetIfEntry = NULL;
-
-       if ((pNetIfEntry = (PNETIF_ENTRY)removeHeadList(&freeNetIfEntryList)) != NULL)
-       {
-               netif_stop_queue(pNetDev);
-               pNetIfEntry->pNetDev = pNetDev;
-               insertTailList(&pBlockQueueEntry->NetIfList, (PLIST_ENTRY)pNetIfEntry);
-
-               pBlockQueueEntry->SwTxQueueBlockFlag = TRUE;
-               DBGPRINT(RT_DEBUG_TRACE, ("netif_stop_queue(%s)\n", pNetDev->name));
-       }
-       else
-               return FALSE;
-
-       return TRUE;
-}
-
-VOID releaseNetIf(
-       IN PBLOCK_QUEUE_ENTRY pBlockQueueEntry)
-{
-       PNETIF_ENTRY pNetIfEntry = NULL;
-       PLIST_HEADER pNetIfList = &pBlockQueueEntry->NetIfList;
-
-       while((pNetIfEntry = (PNETIF_ENTRY)removeHeadList(pNetIfList)) !=  NULL)
-       {
-               PNET_DEV pNetDev = pNetIfEntry->pNetDev;
-               netif_wake_queue(pNetDev);
-               insertTailList(&freeNetIfEntryList, (PLIST_ENTRY)pNetIfEntry);
-
-               DBGPRINT(RT_DEBUG_TRACE, ("netif_wake_queue(%s)\n", pNetDev->name));
-       }
-       pBlockQueueEntry->SwTxQueueBlockFlag = FALSE;
-       return;
-}
-
-
-VOID StopNetIfQueue(
-       IN PRTMP_ADAPTER pAd,
-       IN UCHAR QueIdx,
-       IN PNDIS_PACKET pPacket)
-{
-       PNET_DEV NetDev = NULL;
-       UCHAR IfIdx = 0;
-       BOOLEAN valid = FALSE;
-
-       {
-#ifdef MBSS_SUPPORT
-               if (pAd->OpMode == OPMODE_AP)
-               {
-                       IfIdx = (RTMP_GET_PACKET_NET_DEVICE(pPacket) - MIN_NET_DEVICE_FOR_MBSSID) % MAX_MBSSID_NUM;
-                       NetDev = pAd->ApCfg.MBSSID[IfIdx].MSSIDDev;
-               }
-               else
-               {
-                       IfIdx = MAIN_MBSSID;
-                       NetDev = pAd->net_dev;
-               }
-#else
-               IfIdx = MAIN_MBSSID;
-               NetDev = pAd->net_dev;
-#endif
-       }
-
-       // WMM support 4 software queues.
-       // One software queue full doesn't mean device have no capbility to transmit packet.
-       // So disable block Net-If queue function while WMM enable.
-#ifdef CONFIG_STA_SUPPORT
-       IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
-               valid = (pAd->CommonCfg.bWmmCapable == TRUE) ? FALSE : TRUE;
-#endif // CONFIG_STA_SUPPORT //
-
-       if (valid)
-               blockNetIf(&pAd->blockQueueTab[QueIdx], NetDev);
-       return;
-}
-

diff --git a/drivers/staging/rt2870/netif_block.h b/drivers/staging/rt2870/netif_block.h
deleted file mode 100644 (file)
index 6e5151c..0000000
--- a/drivers/staging/rt2870/netif_block.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- *************************************************************************
- * Ralink Tech Inc.
- * 5F., No.36, Taiyuan St., Jhubei City,
- * Hsinchu County 302,
- * Taiwan, R.O.C.
- *
- * (c) Copyright 2002-2007, Ralink Technology, Inc.
- *
- * This program is free software; you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation; either version 2 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * This program is distributed in the hope that it will be useful,       *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- * GNU General Public License for more details.                          *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program; if not, write to the                         *
- * Free Software Foundation, Inc.,                                       *
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- *                                                                       *
- *************************************************************************
- */
-
-#ifndef __NET_IF_BLOCK_H__
-#define __NET_IF_BLOCK_H__
-
-//#include <linux/device.h>
-#include "link_list.h"
-#include "rtmp.h"
-
-#define FREE_NETIF_POOL_SIZE 32
-
-typedef struct _NETIF_ENTRY
-{
-       struct _NETIF_ENTRY *pNext;
-       PNET_DEV pNetDev;
-} NETIF_ENTRY, *PNETIF_ENTRY;
-
-void initblockQueueTab(
-       IN PRTMP_ADAPTER pAd);
-
-BOOLEAN blockNetIf(
-       IN PBLOCK_QUEUE_ENTRY pBlockQueueEntry,
-       IN PNET_DEV pNetDev);
-
-VOID releaseNetIf(
-       IN PBLOCK_QUEUE_ENTRY pBlockQueueEntry);
-
-VOID StopNetIfQueue(
-       IN PRTMP_ADAPTER pAd,
-       IN UCHAR QueIdx,
-       IN PNDIS_PACKET pPacket);
-#endif // __NET_IF_BLOCK_H__
-

diff --git a/drivers/staging/rt2870/rt_config.h b/drivers/staging/rt2870/rt_config.h
index 7e25baf..5eed501 100644 (file)
--- a/drivers/staging/rt2870/rt_config.h
+++ b/drivers/staging/rt2870/rt_config.h
@@ -67,10 +67,6 @@
 #include    "leap.h"
 #endif // LEAP_SUPPORT //
 
-#ifdef BLOCK_NET_IF
-#include "netif_block.h"
-#endif // BLOCK_NET_IF //
-
 #ifdef IGMP_SNOOP_SUPPORT
 #include "igmp_snoop.h"
 #endif // IGMP_SNOOP_SUPPORT //

diff --git a/drivers/staging/rt2870/rt_main_dev.c b/drivers/staging/rt2870/rt_main_dev.c
index 6cad853..6af9521 100644 (file)
--- a/drivers/staging/rt2870/rt_main_dev.c
+++ b/drivers/staging/rt2870/rt_main_dev.c
@@ -493,11 +493,6 @@ static int rt28xx_init(IN struct net_device *net_dev)
 
        CfgInitHook(pAd);
 
-
-#ifdef BLOCK_NET_IF
-       initblockQueueTab(pAd);
-#endif // BLOCK_NET_IF //
-
 #ifdef CONFIG_STA_SUPPORT
        IF_DEV_CONFIG_OPMODE_ON_STA(pAd)
                NdisAllocateSpinLock(&pAd->MacTabLock);

diff --git a/drivers/staging/rt2870/rtmp.h b/drivers/staging/rt2870/rtmp.h
index 91188b6..eaf958a 100644 (file)
--- a/drivers/staging/rt2870/rtmp.h
+++ b/drivers/staging/rt2870/rtmp.h
@@ -2488,14 +2488,6 @@ typedef struct _APCLI_STRUCT {
 
 // ----------- end of AP ----------------------------
 
-#ifdef BLOCK_NET_IF
-typedef struct _BLOCK_QUEUE_ENTRY
-{
-       BOOLEAN SwTxQueueBlockFlag;
-       LIST_HEADER NetIfList;
-} BLOCK_QUEUE_ENTRY, *PBLOCK_QUEUE_ENTRY;
-#endif // BLOCK_NET_IF //
-
 struct wificonf
 {
        BOOLEAN bShortGI;
@@ -2940,12 +2932,6 @@ typedef struct _RTMP_ADAPTER
 
        struct net_device_stats stats;
 
-#ifdef BLOCK_NET_IF
-       BLOCK_QUEUE_ENTRY               blockQueueTab[NUM_OF_TX_RING];
-#endif // BLOCK_NET_IF //
-
-
-
 #ifdef MULTIPLE_CARD_SUPPORT
        INT32                                   MC_RowID;
        UCHAR                                   MC_FileName[256];

diff --git a/drivers/staging/rt2870/sta/rtmp_data.c b/drivers/staging/rt2870/sta/rtmp_data.c
index 94a3857..b10f3a1 100644 (file)
--- a/drivers/staging/rt2870/sta/rtmp_data.c
+++ b/drivers/staging/rt2870/sta/rtmp_data.c
@@ -1148,9 +1148,6 @@ NDIS_STATUS STASendPacket(
        if (pAd->TxSwQueue[QueIdx].Number >= MAX_PACKETS_IN_QUEUE)
        {
                RTMP_IRQ_UNLOCK(&pAd->irq_lock, IrqFlags);
-#ifdef BLOCK_NET_IF
-               StopNetIfQueue(pAd, QueIdx, pPacket);
-#endif // BLOCK_NET_IF //
                RELEASE_NDIS_PACKET(pAd, pPacket, NDIS_STATUS_FAILURE);
 
                return NDIS_STATUS_FAILURE;