Staging: bcm: silence off by one warning

PATCH New Dan Carpenter 1 participant 1 message Oct 8, 2010

Subsystems (2)

Staging Kernel janitors

lore

Share & tools

lore

Dan Carpenter

author

2010-10-08 13:49 UTC #0 lore raw

PATCH v2 1/1 Staging: bcm: silence off by one warning

"status" is used as an index into the Adapter->PackInfo[] array, which has NO_OF_QUEUES elements.

This code actually works OK. The SearchSfid() function always returns a valid index or it returns NO_OF_QUEUES + 1. But it looks sloppy and it makes the static checkers complain.

Signed-off-by Dan Carpenter <[email protected]>

---
v2: whitespace issue

drivers/staging/bcm/CmHost.c +1 -2

index 0329f7d..37187c4 100644
@@ -2368,8 +2368,7 @@ int get_dsx_sf_data_to_application(PMINI_ADAPTER Adapter, UINT uiSFId, void __us
 	struct _packet_info *psSfInfo=NULL;
 	BCM_DEBUG_PRINT( Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "status =%d",status);
 	status = SearchSfid(Adapter, uiSFId);
-	if(status>NO_OF_QUEUES)
-	{
+	if (status >= NO_OF_QUEUES) {
 		BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, CONN_MSG, DBG_LVL_ALL, "SFID %d not present in queue !!!", uiSFId );
 		return -EINVAL;
 	}

drivers/staging/bcm/Qos.c +1 -2

index 913a1e1..75b2b87 100644
@@ -587,8 +587,7 @@ USHORT ClassifyPacket(PMINI_ADAPTER Adapter,struct sk_buff* skb)
 			pstClassifierRule = &Adapter->astClassifierTable[uiLoopIndex];
 
 			uiSfIndex = SearchSfid(Adapter,pstClassifierRule->ulSFID);
-			if(uiSfIndex > NO_OF_QUEUES)
-			{
+			if (uiSfIndex >= NO_OF_QUEUES) {
 				BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL,  "Queue Not Valid. SearchSfid for this classifier Failed\n");
 				break;
 			}