From 370adc7cb052a29531b8177d3be770ae9e631bd2 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 8 Oct 2010 15:49:04 +0200 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- drivers/staging/bcm/CmHost.c | 3 +-- drivers/staging/bcm/Qos.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/bcm/CmHost.c b/drivers/staging/bcm/CmHost.c index b4113923e3ed..6f388a374ddc 100644 --- a/drivers/staging/bcm/CmHost.c +++ b/drivers/staging/bcm/CmHost.c @@ -2367,8 +2367,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; } diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c index 913a1e1dc28d..75b2b879633f 100644 --- a/drivers/staging/bcm/Qos.c +++ b/drivers/staging/bcm/Qos.c @@ -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; } -- 2.39.2