Browse Source

6lowpan: iphc: Fix parenthesis alignments which off-by-one

CHECK: Alignment should match open parenthesis
+	if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
+	     (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {

CHECK: Alignment should match open parenthesis
+		if ((hdr->priority == 0) &&
+		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {

CHECK: Alignment should match open parenthesis
+		if ((hdr->priority == 0) &&
+		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Marcel Holtmann 11 years ago
parent
commit
3fa71fe0b9
1 changed files with 3 additions and 3 deletions
  1. 3 3
      net/6lowpan/iphc.c

+ 3 - 3
net/6lowpan/iphc.c

@@ -643,11 +643,11 @@ int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
 	tmp = ((tmp & 0x03) << 6) | (tmp >> 2);
 	tmp = ((tmp & 0x03) << 6) | (tmp >> 2);
 
 
 	if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
 	if (((hdr->flow_lbl[0] & 0x0F) == 0) &&
-	     (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {
+	    (hdr->flow_lbl[1] == 0) && (hdr->flow_lbl[2] == 0)) {
 		/* flow label can be compressed */
 		/* flow label can be compressed */
 		iphc0 |= LOWPAN_IPHC_FL_C;
 		iphc0 |= LOWPAN_IPHC_FL_C;
 		if ((hdr->priority == 0) &&
 		if ((hdr->priority == 0) &&
-		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
+		    ((hdr->flow_lbl[0] & 0xF0) == 0)) {
 			/* compress (elide) all */
 			/* compress (elide) all */
 			iphc0 |= LOWPAN_IPHC_TC_C;
 			iphc0 |= LOWPAN_IPHC_TC_C;
 		} else {
 		} else {
@@ -658,7 +658,7 @@ int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
 	} else {
 	} else {
 		/* Flow label cannot be compressed */
 		/* Flow label cannot be compressed */
 		if ((hdr->priority == 0) &&
 		if ((hdr->priority == 0) &&
-		   ((hdr->flow_lbl[0] & 0xF0) == 0)) {
+		    ((hdr->flow_lbl[0] & 0xF0) == 0)) {
 			/* compress only traffic class */
 			/* compress only traffic class */
 			iphc0 |= LOWPAN_IPHC_TC_C;
 			iphc0 |= LOWPAN_IPHC_TC_C;
 			*hc_ptr = (tmp & 0xc0) | (hdr->flow_lbl[0] & 0x0F);
 			*hc_ptr = (tmp & 0xc0) | (hdr->flow_lbl[0] & 0x0F);