aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/bcm/IPv6Protocol.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/bcm/IPv6Protocol.c b/drivers/staging/bcm/IPv6Protocol.c
index 8a35c1f68fbb..01ad11f866c4 100644
--- a/drivers/staging/bcm/IPv6Protocol.c
+++ b/drivers/staging/bcm/IPv6Protocol.c
@@ -11,7 +11,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
11{ 11{
12 UCHAR *pucRetHeaderPtr = NULL; 12 UCHAR *pucRetHeaderPtr = NULL;
13 UCHAR *pucPayloadPtr = NULL; 13 UCHAR *pucPayloadPtr = NULL;
14 USHORT usNextHeaderOffset = 0 ; 14 USHORT usNextHeaderOffset = 0;
15 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 15 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
16 16
17 if ((ppucPayload == NULL) || (*pusPayloadLength == 0) || 17 if ((ppucPayload == NULL) || (*pusPayloadLength == 0) ||
@@ -71,7 +71,7 @@ static UCHAR *GetNextIPV6ChainedHeader(UCHAR **ppucPayload,
71 "\nIPv6 DestOpts Header Header"); 71 "\nIPv6 DestOpts Header Header");
72 usNextHeaderOffset += sizeof(struct bcm_ipv6_dest_options_hdr); 72 usNextHeaderOffset += sizeof(struct bcm_ipv6_dest_options_hdr);
73 usNextHeaderOffset += nTotalOptions * 73 usNextHeaderOffset += nTotalOptions *
74 IPV6_DESTOPTS_HDR_OPTIONSIZE ; 74 IPV6_DESTOPTS_HDR_OPTIONSIZE;
75 } 75 }
76 break; 76 break;
77 77
@@ -282,7 +282,7 @@ USHORT IpVersion6(struct bcm_mini_adapter *Adapter, PVOID pcIpHeader,
282 282
283 283
284static bool MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule, 284static bool MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
285 struct bcm_ipv6_hdr *pstIpv6Header) 285 struct bcm_ipv6_hdr *pstIpv6Header)
286{ 286{
287 UINT uiLoopIndex = 0; 287 UINT uiLoopIndex = 0;
288 UINT uiIpv6AddIndex = 0; 288 UINT uiIpv6AddIndex = 0;
@@ -340,7 +340,7 @@ static bool MatchSrcIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
340} 340}
341 341
342static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule, 342static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
343 struct bcm_ipv6_hdr *pstIpv6Header) 343 struct bcm_ipv6_hdr *pstIpv6Header)
344{ 344{
345 UINT uiLoopIndex = 0; 345 UINT uiLoopIndex = 0;
346 UINT uiIpv6AddIndex = 0; 346 UINT uiIpv6AddIndex = 0;
@@ -354,8 +354,7 @@ static bool MatchDestIpv6Address(struct bcm_classifier_rule *pstClassifierRule,
354 * ie Range of IP Addresses contained in the classifier rule 354 * ie Range of IP Addresses contained in the classifier rule
355 * for which we need to match 355 * for which we need to match
356 */ 356 */
357 UINT uiCountIPDestinationAddresses = (UINT)pstClassifierRule->ucIPDestinationAddressLength; 357 UINT uiCountIPDestinationAddresses = (UINT)pstClassifierRule->ucIPDestinationAddressLength;
358
359 358
360 if (uiCountIPDestinationAddresses == 0) 359 if (uiCountIPDestinationAddresses == 0)
361 return TRUE; 360 return TRUE;