net: Change pseudohdr argument of inet_proto_csum_replace* to be a bool

inet_proto_csum_replace4,2,16 take a pseudohdr argument which indicates
the checksum field carries a pseudo header. This argument should be a
boolean instead of an int.

Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 15 insertions, 14 deletions

diff --git a/net/netfilter/nf_conntrack_seqadj.c b/net/netfilter/nf_conntrack_seqadj.c
index ce3e840c8704..dff0f0cc59e4 100644
--- a/net/netfilter/nf_conntrack_seqadj.c
+++ b/net/netfilter/nf_conntrack_seqadj.c
@@ -103,9 +103,9 @@ static void nf_ct_sack_block_adjust(struct sk_buff *skb,
                          ntohl(sack->end_seq), ntohl(new_end_seq));
 
                 inet_proto_csum_replace4(&tcph->check, skb,
-                                         sack->start_seq, new_start_seq, 0);
+                                         sack->start_seq, new_start_seq, false);
                 inet_proto_csum_replace4(&tcph->check, skb,
-                                         sack->end_seq, new_end_seq, 0);
+                                         sack->end_seq, new_end_seq, false);
                 sack->start_seq = new_start_seq;
                 sack->end_seq = new_end_seq;
                 sackoff += sizeof(*sack);
@@ -193,8 +193,9 @@ int nf_ct_seq_adjust(struct sk_buff *skb,
         newseq = htonl(ntohl(tcph->seq) + seqoff);
         newack = htonl(ntohl(tcph->ack_seq) - ackoff);
 
-        inet_proto_csum_replace4(&tcph->check, skb, tcph->seq, newseq, 0);
-        inet_proto_csum_replace4(&tcph->check, skb, tcph->ack_seq, newack, 0);
+        inet_proto_csum_replace4(&tcph->check, skb, tcph->seq, newseq, false);
+        inet_proto_csum_replace4(&tcph->check, skb, tcph->ack_seq, newack,
+                                 false);
 
         pr_debug("Adjusting sequence number from %u->%u, ack from %u->%u\n",
                  ntohl(tcph->seq), ntohl(newseq), ntohl(tcph->ack_seq),
diff --git a/net/netfilter/nf_nat_proto_dccp.c b/net/netfilter/nf_nat_proto_dccp.c
index b8067b53ff3a..15c47b246d0d 100644
--- a/net/netfilter/nf_nat_proto_dccp.c
+++ b/net/netfilter/nf_nat_proto_dccp.c
@@ -69,7 +69,7 @@ dccp_manip_pkt(struct sk_buff *skb,
         l3proto->csum_update(skb, iphdroff, &hdr->dccph_checksum,
                              tuple, maniptype);
         inet_proto_csum_replace2(&hdr->dccph_checksum, skb, oldport, newport,
-                                 0);
+                                 false);
         return true;
 }
 
diff --git a/net/netfilter/nf_nat_proto_tcp.c b/net/netfilter/nf_nat_proto_tcp.c
index 37f5505f4529..4f8820fc5148 100644
--- a/net/netfilter/nf_nat_proto_tcp.c
+++ b/net/netfilter/nf_nat_proto_tcp.c
@@ -70,7 +70,7 @@ tcp_manip_pkt(struct sk_buff *skb,
                 return true;
 
         l3proto->csum_update(skb, iphdroff, &hdr->check, tuple, maniptype);
-        inet_proto_csum_replace2(&hdr->check, skb, oldport, newport, 0);
+        inet_proto_csum_replace2(&hdr->check, skb, oldport, newport, false);
         return true;
 }
 
diff --git a/net/netfilter/nf_nat_proto_udp.c b/net/netfilter/nf_nat_proto_udp.c
index b0ede2f0d8bc..b1e627227b6e 100644
--- a/net/netfilter/nf_nat_proto_udp.c
+++ b/net/netfilter/nf_nat_proto_udp.c
@@ -57,7 +57,7 @@ udp_manip_pkt(struct sk_buff *skb,
                 l3proto->csum_update(skb, iphdroff, &hdr->check,
                                      tuple, maniptype);
                 inet_proto_csum_replace2(&hdr->check, skb, *portptr, newport,
-                                         0);
+                                         false);
                 if (!hdr->check)
                         hdr->check = CSUM_MANGLED_0;
         }
diff --git a/net/netfilter/nf_nat_proto_udplite.c b/net/netfilter/nf_nat_proto_udplite.c
index 368f14e01e75..58340c97bd83 100644
--- a/net/netfilter/nf_nat_proto_udplite.c
+++ b/net/netfilter/nf_nat_proto_udplite.c
@@ -56,7 +56,7 @@ udplite_manip_pkt(struct sk_buff *skb,
         }
 
         l3proto->csum_update(skb, iphdroff, &hdr->check, tuple, maniptype);
-        inet_proto_csum_replace2(&hdr->check, skb, *portptr, newport, 0);
+        inet_proto_csum_replace2(&hdr->check, skb, *portptr, newport, false);
         if (!hdr->check)
                 hdr->check = CSUM_MANGLED_0;
 
diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
index d7f168527903..14f8b43ec5a7 100644
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@ -225,7 +225,7 @@ unsigned int synproxy_tstamp_adjust(struct sk_buff *skb,
                                                      synproxy->tsoff);
                                 }
                                 inet_proto_csum_replace4(&th->check, skb,
-                                                         old, *ptr, 0);
+                                                         old, *ptr, false);
                                 return 1;
                         }
                         optoff += op[1];
diff --git a/net/netfilter/xt_TCPMSS.c b/net/netfilter/xt_TCPMSS.c
index 8c3190e2fc6a..8c02501a530f 100644
--- a/net/netfilter/xt_TCPMSS.c
+++ b/net/netfilter/xt_TCPMSS.c
@@ -144,7 +144,7 @@ tcpmss_mangle_packet(struct sk_buff *skb,
 
                         inet_proto_csum_replace2(&tcph->check, skb,
                                                  htons(oldmss), htons(newmss),
-                                                 0);
+                                                 false);
                         return 0;
                 }
         }
@@ -185,18 +185,18 @@ tcpmss_mangle_packet(struct sk_buff *skb,
         memmove(opt + TCPOLEN_MSS, opt, len - sizeof(struct tcphdr));
 
         inet_proto_csum_replace2(&tcph->check, skb,
-                                 htons(len), htons(len + TCPOLEN_MSS), 1);
+                                 htons(len), htons(len + TCPOLEN_MSS), true);
         opt[0] = TCPOPT_MSS;
         opt[1] = TCPOLEN_MSS;
         opt[2] = (newmss & 0xff00) >> 8;
         opt[3] = newmss & 0x00ff;
 
-        inet_proto_csum_replace4(&tcph->check, skb, 0, *((__be32 *)opt), 0);
+        inet_proto_csum_replace4(&tcph->check, skb, 0, *((__be32 *)opt), false);
 
         oldval = ((__be16 *)tcph)[6];
         tcph->doff += TCPOLEN_MSS/4;
         inet_proto_csum_replace2(&tcph->check, skb,
-                                 oldval, ((__be16 *)tcph)[6], 0);
+                                 oldval, ((__be16 *)tcph)[6], false);
         return TCPOLEN_MSS;
 }
 
diff --git a/net/netfilter/xt_TCPOPTSTRIP.c b/net/netfilter/xt_TCPOPTSTRIP.c
index 625fa1d636a0..eb92bffff11c 100644
--- a/net/netfilter/xt_TCPOPTSTRIP.c
+++ b/net/netfilter/xt_TCPOPTSTRIP.c
@@ -80,7 +80,7 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,
                                 n <<= 8;
                         }
                         inet_proto_csum_replace2(&tcph->check, skb, htons(o),
-                                                 htons(n), 0);
+                                                 htons(n), false);
                 }
                 memset(opt + i, TCPOPT_NOP, optl);
         }