staging: bcm: fix checkpatch error 'assignment in if condition'

clean up checkpatch errors and bClassificationSucceed is set to "TRUE"
proper location.

If protocal is not TCP or UDP, when it checks protocal, bClassificationSucceed
must be set to TRUE.
Also the end of do-while(0) loop, bClassificationSucceed is set to TRUE.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/bcm/Qos.c b/drivers/staging/bcm/Qos.c
index ead57b4237918a14974c32d9a8e2582048b9f2cb..4f315835ddfcfd0348d6f70c203f0fb0d3b93cb1 100644 (file)
--- a/drivers/staging/bcm/Qos.c
+++ b/drivers/staging/bcm/Qos.c
@@ -230,51 +230,47 @@ static USHORT     IpVersion4(struct bcm_mini_adapter *Adapter,
 
                //**************Checking IP header parameter**************************//
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Trying to match Source IP Address");
-               if (false == (bClassificationSucceed =
-                       MatchSrcIpAddress(pstClassifierRule, iphd->saddr)))
+               if (!MatchSrcIpAddress(pstClassifierRule, iphd->saddr))
                        break;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source IP Address Matched");
 
-               if (false == (bClassificationSucceed =
-                       MatchDestIpAddress(pstClassifierRule, iphd->daddr)))
+               if (!MatchDestIpAddress(pstClassifierRule, iphd->daddr))
                        break;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Destination IP Address Matched");
 
-               if (false == (bClassificationSucceed =
-                       MatchTos(pstClassifierRule, iphd->tos)))
-               {
+               if (!MatchTos(pstClassifierRule, iphd->tos)) {
                        BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "TOS Match failed\n");
                        break;
                }
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "TOS Matched");
 
-               if (false == (bClassificationSucceed =
-                       MatchProtocol(pstClassifierRule, iphd->protocol)))
+               if (!MatchProtocol(pstClassifierRule, iphd->protocol))
                        break;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Protocol Matched");
 
                //if protocol is not TCP or UDP then no need of comparing source port and destination port
-               if (iphd->protocol != TCP && iphd->protocol != UDP)
+               if (iphd->protocol != TCP && iphd->protocol != UDP) {
+                       bClassificationSucceed = TRUE;
                        break;
+               }
                //******************Checking Transport Layer Header field if present *****************//
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Source Port %04x",
                        (iphd->protocol == UDP) ? xprt_hdr->uhdr.source : xprt_hdr->thdr.source);
 
-               if (false == (bClassificationSucceed =
-                       MatchSrcPort(pstClassifierRule,
-                               ntohs((iphd->protocol == UDP) ?
-                               xprt_hdr->uhdr.source : xprt_hdr->thdr.source))))
+               if (!MatchSrcPort(pstClassifierRule,
+                                 ntohs((iphd->protocol == UDP) ?
+                                 xprt_hdr->uhdr.source : xprt_hdr->thdr.source)))
                        break;
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Src Port Matched");
 
                BCM_DEBUG_PRINT(Adapter, DBG_TYPE_TX, IPV4_DBG, DBG_LVL_ALL, "Destination Port %04x",
                        (iphd->protocol == UDP) ? xprt_hdr->uhdr.dest :
                        xprt_hdr->thdr.dest);
-               if (false == (bClassificationSucceed =
-                       MatchDestPort(pstClassifierRule,
-                       ntohs((iphd->protocol == UDP) ?
-                       xprt_hdr->uhdr.dest : xprt_hdr->thdr.dest))))
+               if (!MatchDestPort(pstClassifierRule,
+                                  ntohs((iphd->protocol == UDP) ?
+                                  xprt_hdr->uhdr.dest : xprt_hdr->thdr.dest)))
                        break;
+               bClassificationSucceed = TRUE;
        } while (0);
 
        if (TRUE == bClassificationSucceed)