aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2015-10-14 18:17:08 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2015-10-16 13:19:23 -0400
commitc8d71d08aa23679f56e7072358383442c6ede352 (patch)
treea973098df09a138ca2f6690237cf1c6c3ff7af12
parent24cebe3f29884bb8f4581c68ba7a124ade0099b0 (diff)
netfilter: ipv4: whitespace around operators
This patch cleanses whitespace around arithmetical operators. No changes detected by objdiff. Signed-off-by: Ian Morris <ipm@chirality.org.uk> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-rw-r--r--net/ipv4/netfilter/ipt_CLUSTERIP.c8
-rw-r--r--net/ipv4/netfilter/ipt_ah.c2
-rw-r--r--net/ipv4/netfilter/nf_nat_snmp_basic.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 3f32c03e8b2e..4a9e6db9df8d 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -492,14 +492,14 @@ static void arp_print(struct arp_payload *payload)
492{ 492{
493#define HBUFFERLEN 30 493#define HBUFFERLEN 30
494 char hbuffer[HBUFFERLEN]; 494 char hbuffer[HBUFFERLEN];
495 int j,k; 495 int j, k;
496 496
497 for (k=0, j=0; k < HBUFFERLEN-3 && j < ETH_ALEN; j++) { 497 for (k = 0, j = 0; k < HBUFFERLEN - 3 && j < ETH_ALEN; j++) {
498 hbuffer[k++] = hex_asc_hi(payload->src_hw[j]); 498 hbuffer[k++] = hex_asc_hi(payload->src_hw[j]);
499 hbuffer[k++] = hex_asc_lo(payload->src_hw[j]); 499 hbuffer[k++] = hex_asc_lo(payload->src_hw[j]);
500 hbuffer[k++]=':'; 500 hbuffer[k++] = ':';
501 } 501 }
502 hbuffer[--k]='\0'; 502 hbuffer[--k] = '\0';
503 503
504 pr_debug("src %pI4@%s, dst %pI4\n", 504 pr_debug("src %pI4@%s, dst %pI4\n",
505 &payload->src_ip, hbuffer, &payload->dst_ip); 505 &payload->src_ip, hbuffer, &payload->dst_ip);
diff --git a/net/ipv4/netfilter/ipt_ah.c b/net/ipv4/netfilter/ipt_ah.c
index 14a2aa8b8a14..a787d07f6cb7 100644
--- a/net/ipv4/netfilter/ipt_ah.c
+++ b/net/ipv4/netfilter/ipt_ah.c
@@ -25,7 +25,7 @@ spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, bool invert)
25 bool r; 25 bool r;
26 pr_debug("spi_match:%c 0x%x <= 0x%x <= 0x%x\n", 26 pr_debug("spi_match:%c 0x%x <= 0x%x <= 0x%x\n",
27 invert ? '!' : ' ', min, spi, max); 27 invert ? '!' : ' ', min, spi, max);
28 r=(spi >= min && spi <= max) ^ invert; 28 r = (spi >= min && spi <= max) ^ invert;
29 pr_debug(" result %s\n", r ? "PASS" : "FAILED"); 29 pr_debug(" result %s\n", r ? "PASS" : "FAILED");
30 return r; 30 return r;
31} 31}
diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
index 7c676671329d..ddb894ac1458 100644
--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
@@ -1156,7 +1156,7 @@ static int snmp_parse_mangle(unsigned char *msg,
1156 } 1156 }
1157 1157
1158 if (obj->type == SNMP_IPADDR) 1158 if (obj->type == SNMP_IPADDR)
1159 mangle_address(ctx.begin, ctx.pointer - 4 , map, check); 1159 mangle_address(ctx.begin, ctx.pointer - 4, map, check);
1160 1160
1161 kfree(obj->id); 1161 kfree(obj->id);
1162 kfree(obj); 1162 kfree(obj);