Merge branch 'linus' into cpus4096-for-linus

[linux-2.6] / net / ipv4 / netfilter / nf_nat_proto_dccp.c

diff --git a/net/ipv4/netfilter/nf_nat_proto_dccp.c b/net/ipv4/netfilter/nf_nat_proto_dccp.c
index 12b51b38442e96687cd1ea954321a45deb2a43a3..22485ce306d41f2d175786bdc9fc7f20160306e2 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_proto_dccp.c
+++ b/net/ipv4/netfilter/nf_nat_proto_dccp.c
@@ -22,7 +22,7 @@
 
 static u_int16_t dccp_port_rover;
 
-static int
+static bool
 dccp_unique_tuple(struct nf_conntrack_tuple *tuple,
                  const struct nf_nat_range *range,
                  enum nf_nat_manip_type maniptype,
@@ -32,13 +32,13 @@ dccp_unique_tuple(struct nf_conntrack_tuple *tuple,
                                         &dccp_port_rover);
 }
 
-static int
+static bool
 dccp_manip_pkt(struct sk_buff *skb,
               unsigned int iphdroff,
               const struct nf_conntrack_tuple *tuple,
               enum nf_nat_manip_type maniptype)
 {
-       struct iphdr *iph = (struct iphdr *)(skb->data + iphdroff);
+       const struct iphdr *iph = (const void *)(skb->data + iphdroff);
        struct dccp_hdr *hdr;
        unsigned int hdroff = iphdroff + iph->ihl * 4;
        __be32 oldip, newip;
@@ -49,7 +49,7 @@ dccp_manip_pkt(struct sk_buff *skb,
                hdrsize = sizeof(struct dccp_hdr);
 
        if (!skb_make_writable(skb, hdroff + hdrsize))
-               return 0;
+               return false;
 
        iph = (struct iphdr *)(skb->data + iphdroff);
        hdr = (struct dccp_hdr *)(skb->data + hdroff);
@@ -70,12 +70,12 @@ dccp_manip_pkt(struct sk_buff *skb,
        *portptr = newport;
 
        if (hdrsize < sizeof(*hdr))
-               return 1;
+               return true;
 
        inet_proto_csum_replace4(&hdr->dccph_checksum, skb, oldip, newip, 1);
        inet_proto_csum_replace2(&hdr->dccph_checksum, skb, oldport, newport,
                                 0);
-       return 1;
+       return true;
 }
 
 static const struct nf_nat_protocol nf_nat_protocol_dccp = {