remove code for client WDS

Signed-off-by: Hans Ulli Kroll <[email protected]>

Makefile

@@ -116,9 +116,6 @@ HAS_IFUP_IN_PROBE_SUPPORT=n
 #Support TXRX SW Antenna Diversity
 HAS_TXRX_SW_ANTDIV_SUPPORT=n
 
-#Client support WDS function
-HAS_CLIENT_WDS_SUPPORT=n
-
 #Support for Bridge Fast Path & Bridge Fast Path function open to other module
 HAS_BGFP_SUPPORT=n
 HAS_BGFP_OPEN_SUPPORT=n
@@ -389,10 +386,6 @@ ifeq ($(HAS_IDS_SUPPORT),y)
 WFLAGS += -DIDS_SUPPORT
 endif
 
-ifeq ($(HAS_CLIENT_WDS_SUPPORT),y)
-WFLAGS += -DCLIENT_WDS
-endif
-
 ifeq ($(HAS_BGFP_SUPPORT),y)
 WFLAGS += -DBG_FT_SUPPORT
 endif

common/cmm_cfg.c

@@ -1066,26 +1066,6 @@ INT RTMP_COM_IoctlHandle(
 				return NDIS_STATUS_FAILURE;
 			break;
 
-#ifdef WDS_SUPPORT
-		case CMD_RTPRIV_IOCTL_WDS_INIT:
-			WDS_Init(pAd, pData);
-			break;
-
-		case CMD_RTPRIV_IOCTL_WDS_REMOVE:
-			WDS_Remove(pAd);
-			break;
-
-		case CMD_RTPRIV_IOCTL_WDS_STATS_GET:
-			if (Data == INT_WDS)
-			{
-				if (WDS_StatsGet(pAd, pData) != TRUE)
-					return NDIS_STATUS_FAILURE;
-			}
-			else
-				return NDIS_STATUS_FAILURE;
-			break;
-#endif /* WDS_SUPPORT */
-
 		case CMD_RTPRIV_IOCTL_MAC_ADDR_GET:
 
 			RT28xx_EEPROM_READ16(pAd, 0x04, Addr01);

common/rtmp_init.c

@@ -1823,19 +1823,6 @@ void NICUpdateFifoStaCounters(
 						for (tid=0; tid<NUM_OF_TID; tid++)
 							BAOriSessionTearDown(pAd, pEntry->Aid,  tid, FALSE, FALSE);
 #endif /* DOT11_N_SUPPORT */
-
-#ifdef WDS_SUPPORT
-						/* fix WDS Jam issue*/
-						if(IS_ENTRY_WDS(pEntry)
-							&& (pEntry->LockEntryTx == FALSE)
-							&& (pEntry->ContinueTxFailCnt >= pAd->ApCfg.EntryLifeCheck))
-						{
-							DBGPRINT(RT_DEBUG_TRACE, ("Entry %02x:%02x:%02x:%02x:%02x:%02x Blocked!! (Fail Cnt = %d)\n",
-								PRINT_MAC(pEntry->Addr), pEntry->ContinueTxFailCnt ));
-
-							pEntry->LockEntryTx = TRUE;
-						}
-#endif /* WDS_SUPPORT */
 					}
 				}
 			}
@@ -1858,10 +1845,6 @@ void NICUpdateFifoStaCounters(
 				/* update NoDataIdleCount when sucessful send packet to STA.*/
 				pEntry->NoDataIdleCount = 0;
 				pEntry->ContinueTxFailCnt = 0;
-#ifdef WDS_SUPPORT
-				pEntry->LockEntryTx = FALSE;
-#endif /* WDS_SUPPORT */
-
 #ifdef CONFIG_STA_SUPPORT
 #endif /* CONFIG_STA_SUPPORT */
 			}

common/rtmp_init_inf.c

@@ -72,9 +72,6 @@ void RtmpDrvOpsInit(
 #ifdef MBSS_SUPPORT
 	pDrvOps->MBSS_PacketSend = MBSS_PacketSend;
 #endif /* MBSS_SUPPORT */
-#ifdef WDS_SUPPORT
-	pDrvOps->WDS_PacketSend = WDS_PacketSend;
-#endif /* WDS_SUPPORT */
 #ifdef APCLI_SUPPORT
 	pDrvOps->APC_PacketSend = APC_PacketSend;
 #endif /* APCLI_SUPPORT */

common/spectrum.c

@@ -1294,101 +1294,6 @@ void EnqueueTPCRep(
 	return;
 }
 
-#ifdef WDS_SUPPORT
-/*
-	==========================================================================
-	Description:
-		Insert Channel Switch Announcement IE into frame.
-
-	Parametrs:
-		1. frame buffer pointer.
-		2. frame length.
-		3. channel switch announcement mode.
-		4. new selected channel.
-		5. channel switch announcement count.
-
-	Return	: None.
-	==========================================================================
- */
-static void InsertChSwAnnIE(
-	IN struct rtmp_adapter *pAd,
-	OUT PUCHAR pFrameBuf,
-	OUT PULONG pFrameLen,
-	IN u8 ChSwMode,
-	IN u8 NewChannel,
-	IN u8 ChSwCnt)
-{
-	ULONG TempLen;
-	ULONG Len = sizeof(CH_SW_ANN_INFO);
-	u8 ElementID = IE_CHANNEL_SWITCH_ANNOUNCEMENT;
-	CH_SW_ANN_INFO ChSwAnnIE;
-
-	ChSwAnnIE.ChSwMode = ChSwMode;
-	ChSwAnnIE.Channel = NewChannel;
-	ChSwAnnIE.ChSwCnt = ChSwCnt;
-
-	MakeOutgoingFrame(pFrameBuf,				&TempLen,
-						1,						&ElementID,
-						1,						&Len,
-						Len,					&ChSwAnnIE,
-						END_OF_ARGS);
-
-	*pFrameLen = *pFrameLen + TempLen;
-
-
-	return;
-}
-
-/*
-	==========================================================================
-	Description:
-		Prepare Channel Switch Announcement action frame and enqueue it into
-		management queue waiting for transmition.
-
-	Parametrs:
-		1. the destination mac address of the frame.
-		2. Channel switch announcement mode.
-		2. a New selected channel.
-
-	Return	: None.
-	==========================================================================
- */
-void EnqueueChSwAnn(
-	IN struct rtmp_adapter *pAd,
-	IN PUCHAR pDA,
-	IN u8 ChSwMode,
-	IN u8 NewCh)
-{
-	PUCHAR pOutBuffer = NULL;
-	NDIS_STATUS NStatus;
-	ULONG FrameLen;
-
-	HEADER_802_11 ActHdr;
-
-	/* build action frame header.*/
-	MgtMacHeaderInit(pAd, &ActHdr, SUBTYPE_ACTION, 0, pDA,
-						pAd->CurrentAddress);
-
-	NStatus = os_alloc_mem(pAd, (void *)&pOutBuffer, MGMT_DMA_BUFFER_SIZE);  /*Get an unused nonpaged memory*/
-	if(NStatus != NDIS_STATUS_SUCCESS)
-	{
-		DBGPRINT(RT_DEBUG_TRACE, ("%s() allocate memory failed \n", __FUNCTION__));
-		return;
-	}
-	NdisMoveMemory(pOutBuffer, (char *)&ActHdr, sizeof(HEADER_802_11));
-	FrameLen = sizeof(HEADER_802_11);
-
-	InsertActField(pAd, (pOutBuffer + FrameLen), &FrameLen, CATEGORY_SPECTRUM, SPEC_CHANNEL_SWITCH);
-
-	InsertChSwAnnIE(pAd, (pOutBuffer + FrameLen), &FrameLen, ChSwMode, NewCh, 0);
-
-	MiniportMMRequest(pAd, QID_AC_BE, pOutBuffer, FrameLen);
-	kfree(pOutBuffer);
-
-	return;
-}
-#endif /* WDS_SUPPORT */
-
 static BOOLEAN DfsRequirementCheck(
 	IN struct rtmp_adapter *pAd,
 	IN u8 Channel)
@@ -1430,27 +1335,6 @@ void NotifyChSwAnnToPeerAPs(
 	IN u8 ChSwMode,
 	IN u8 Channel)
 {
-#ifdef WDS_SUPPORT
-	if (!((pRA[0] & 0xff) == 0xff)) /* is pRA a broadcase address.*/
-	{
-		INT i;
-		/* info neighbor APs that Radar signal found throgh WDS link.*/
-		for (i = 0; i < MAX_WDS_ENTRY; i++)
-		{
-			if (ValidWdsEntry(pAd, i))
-			{
-				PUCHAR pDA = pAd->WdsTab.WdsEntry[i].PeerWdsAddr;
-
-				/* DA equal to SA. have no necessary orignal AP which found Radar signal.*/
-				if (MAC_ADDR_EQUAL(pTA, pDA))
-					continue;
-
-				/* send Channel Switch Action frame to info Neighbro APs.*/
-				EnqueueChSwAnn(pAd, pDA, ChSwMode, Channel);
-			}
-		}
-	}
-#endif /* WDS_SUPPORT */
 }
 
 static void StartDFSProcedure(

include/rtmp.h

@@ -2199,9 +2199,6 @@ typedef struct _MAC_TABLE_ENTRY {
 	UINT32 ContinueTxFailCnt;
 	UINT32 CurrTxRateStableTime;	/* # of second in current TX rate */
 	UCHAR TxRateUpPenalty;	/* extra # of second penalty due to last unstable condition */
-#ifdef WDS_SUPPORT
-	BOOLEAN LockEntryTx;	/* TRUE = block to WDS Entry traffic, FALSE = not. */
-#endif /* WDS_SUPPORT */
 	ULONG TimeStamp_toTxRing;
 
 /*==================================================== */

include/rtmp_def.h

@@ -1564,7 +1564,6 @@ enum WIFI_MODE{
  */
 #define INT_MAIN			0x0100
 #define INT_MBSSID			0x0200
-#define INT_WDS				0x0300
 #define INT_APCLI			0x0400
 #define INT_MESH			0x0500
 #define INT_P2P				0x0600

include/spectrum.h

@@ -122,28 +122,6 @@ void EnqueueTPCRep(
 	IN u8 TxPwr,
 	IN u8 LinkMargin);
 
-#ifdef WDS_SUPPORT
-/*
-	==========================================================================
-	Description:
-		Prepare Channel Switch Announcement action frame and enqueue it into
-		management queue waiting for transmition.
-
-	Parametrs:
-		1. the destination mac address of the frame.
-		2. Channel switch announcement mode.
-		2. a New selected channel.
-
-	Return	: None.
-	==========================================================================
- */
-void EnqueueChSwAnn(
-	IN struct rtmp_adapter *pAd,
-	IN PUCHAR pDA,
-	IN u8 ChSwMode,
-	IN u8 NewCh);
-#endif /* WDS_SUPPORT */
-
 /*
 	==========================================================================
 	Description:

mgmt/mgmt_entrytb.c

@@ -277,14 +277,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
 					break;
 				}
 #endif // APCLI_SUPPORT //
-#ifdef WDS_SUPPORT
-				if (IS_ENTRY_WDS(pEntry))
-				{
-					COPY_MAC_ADDR(pEntry->HdrAddr2, pAd->ApCfg.MBSSID[MAIN_MBSSID].Bssid);
-					COPY_MAC_ADDR(pEntry->HdrAddr3, pAd->ApCfg.MBSSID[MAIN_MBSSID].Bssid);
-					break;
-				}
-#endif // WDS_SUPPORT //
 #ifdef CONFIG_STA_SUPPORT
 				if (OpMode == OPMODE_STA)
 				{
@@ -304,9 +296,6 @@ MAC_TABLE_ENTRY *MacTableInsertEntry(
 			pEntry->NoDataIdleCount = 0;
 			pEntry->AssocDeadLine = MAC_TABLE_ASSOC_TIMEOUT;
 			pEntry->ContinueTxFailCnt = 0;
-#ifdef WDS_SUPPORT
-			pEntry->LockEntryTx = FALSE;
-#endif /* WDS_SUPPORT */
 			pEntry->TimeStamp_toTxRing = 0;
 			InitializeQueueHeader(&pEntry->PsQueue);
 

os/linux/rt_main_dev.c

@@ -325,10 +325,6 @@ int rt28xx_open(void *dev)
 	RT28xx_MBSS_Init(pAd, net_dev);
 #endif /* MBSS_SUPPORT */
 
-#ifdef WDS_SUPPORT
-	RT28xx_WDS_Init(pAd, net_dev);
-#endif /* WDS_SUPPORT */
-
 #ifdef APCLI_SUPPORT
 	RT28xx_ApCli_Init(pAd, net_dev);
 #endif /* APCLI_SUPPORT */
@@ -678,90 +674,6 @@ int RtmpOSIRQRequest(IN struct net_device *pNetDev)
 
 }
 
-#ifdef WDS_SUPPORT
-/*
-    ========================================================================
-
-    Routine Description:
-        return ethernet statistics counter
-
-    Arguments:
-        net_dev                     Pointer to net_device
-
-    Return Value:
-        net_device_stats*
-
-    Note:
-
-    ========================================================================
-*/
-struct net_device_stats *RT28xx_get_wds_ether_stats(
-    IN struct net_device *net_dev)
-{
-    void *pAd = NULL;
-/*	INT WDS_apidx = 0,index; */
-	struct net_device_stats *pStats;
-	RT_CMD_STATS WdsStats, *pWdsStats = &WdsStats;
-
-	if (net_dev) {
-		GET_PAD_FROM_NET_DEV(pAd, net_dev);
-	}
-
-/*	if (RT_DEV_PRIV_FLAGS_GET(net_dev) == INT_WDS) */
-	{
-		if (pAd)
-		{
-
-			pWdsStats->pNetDev = net_dev;
-			if (RTMP_COM_IoctlHandle(pAd, NULL, CMD_RTPRIV_IOCTL_WDS_STATS_GET,
-					0, pWdsStats, RT_DEV_PRIV_FLAGS_GET(net_dev)) != NDIS_STATUS_SUCCESS)
-				return NULL;
-
-			pStats = (struct net_device_stats *)pWdsStats->pStats; /*pAd->stats; */
-
-			pStats->rx_packets = pWdsStats->rx_packets; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.ReceivedFragmentCount.QuadPart; */
-			pStats->tx_packets = pWdsStats->tx_packets; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.TransmittedFragmentCount.QuadPart; */
-
-			pStats->rx_bytes = pWdsStats->rx_bytes; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.ReceivedByteCount; */
-			pStats->tx_bytes = pWdsStats->tx_bytes; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.TransmittedByteCount; */
-
-			pStats->rx_errors = pWdsStats->rx_errors; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.RxErrors; */
-			pStats->tx_errors = pWdsStats->tx_errors; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.TxErrors; */
-
-			pStats->rx_dropped = 0;
-			pStats->tx_dropped = 0;
-
-	  		pStats->multicast = pWdsStats->multicast; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.MulticastReceivedFrameCount.QuadPart;   // multicast packets received */
-	  		pStats->collisions = pWdsStats->collisions; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.OneCollision + pAd->WdsTab.WdsEntry[index].WdsCounter.MoreCollisions;  // Collision packets */
-
-	  		pStats->rx_length_errors = 0;
-	  		pStats->rx_over_errors = pWdsStats->rx_over_errors; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.RxNoBuffer;                   // receiver ring buff overflow */
-	  		pStats->rx_crc_errors = 0;/*pAd->WlanCounters.FCSErrorCount;     // recved pkt with crc error */
-	  		pStats->rx_frame_errors = pWdsStats->rx_frame_errors; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.RcvAlignmentErrors;          // recv'd frame alignment error */
-	  		pStats->rx_fifo_errors = pWdsStats->rx_fifo_errors; /*pAd->WdsTab.WdsEntry[WDS_apidx].WdsCounter.RxNoBuffer;                   // recv'r fifo overrun */
-	  		pStats->rx_missed_errors = 0;                                            /* receiver missed packet */
-
-	  		    /* detailed tx_errors */
-	  		pStats->tx_aborted_errors = 0;
-	  		pStats->tx_carrier_errors = 0;
-	  		pStats->tx_fifo_errors = 0;
-	  		pStats->tx_heartbeat_errors = 0;
-	  		pStats->tx_window_errors = 0;
-
-	  		    /* for cslip etc */
-	  		pStats->rx_compressed = 0;
-	  		pStats->tx_compressed = 0;
-
-			return pStats;
-		}
-		else
-			return NULL;
-	}
-/*	else */
-/*    		return NULL; */
-}
-#endif /* WDS_SUPPORT */
-