[NETFILTER]: nf_nat: use bool type in nf_nat_proto

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h
index fba94a2..f3662c4 100644 (file)
--- a/include/net/netfilter/nf_nat_protocol.h
+++ b/include/net/netfilter/nf_nat_protocol.h
@@ -15,25 +15,25 @@ struct nf_nat_protocol
 
        /* Translate a packet to the target according to manip type.
           Return true if succeeded. */
-       int (*manip_pkt)(struct sk_buff *skb,
-                        unsigned int iphdroff,
-                        const struct nf_conntrack_tuple *tuple,
-                        enum nf_nat_manip_type maniptype);
+       bool (*manip_pkt)(struct sk_buff *skb,
+                         unsigned int iphdroff,
+                         const struct nf_conntrack_tuple *tuple,
+                         enum nf_nat_manip_type maniptype);
 
        /* Is the manipable part of the tuple between min and max incl? */
-       int (*in_range)(const struct nf_conntrack_tuple *tuple,
-                       enum nf_nat_manip_type maniptype,
-                       const union nf_conntrack_man_proto *min,
-                       const union nf_conntrack_man_proto *max);
+       bool (*in_range)(const struct nf_conntrack_tuple *tuple,
+                        enum nf_nat_manip_type maniptype,
+                        const union nf_conntrack_man_proto *min,
+                        const union nf_conntrack_man_proto *max);
 
        /* Alter the per-proto part of the tuple (depending on
           maniptype), to give a unique tuple in the given range if
           possible; return false if not.  Per-protocol part of tuple
           is initialized to the incoming packet. */
-       int (*unique_tuple)(struct nf_conntrack_tuple *tuple,
-                           const struct nf_nat_range *range,
-                           enum nf_nat_manip_type maniptype,
-                           const struct nf_conn *ct);
+       bool (*unique_tuple)(struct nf_conntrack_tuple *tuple,
+                            const struct nf_nat_range *range,
+                            enum nf_nat_manip_type maniptype,
+                            const struct nf_conn *ct);
 
        int (*range_to_nlattr)(struct sk_buff *skb,
                               const struct nf_nat_range *range);
@@ -59,16 +59,16 @@ extern int init_protocols(void) __init;
 extern void cleanup_protocols(void);
 extern const struct nf_nat_protocol *find_nat_proto(u_int16_t protonum);
 
-extern int nf_nat_proto_in_range(const struct nf_conntrack_tuple *tuple,
-                                enum nf_nat_manip_type maniptype,
-                                const union nf_conntrack_man_proto *min,
-                                const union nf_conntrack_man_proto *max);
+extern bool nf_nat_proto_in_range(const struct nf_conntrack_tuple *tuple,
+                                 enum nf_nat_manip_type maniptype,
+                                 const union nf_conntrack_man_proto *min,
+                                 const union nf_conntrack_man_proto *max);
 
-extern int nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,
-                                    const struct nf_nat_range *range,
-                                    enum nf_nat_manip_type maniptype,
-                                    const struct nf_conn *ct,
-                                    u_int16_t *rover);
+extern bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,
+                                     const struct nf_nat_range *range,
+                                     enum nf_nat_manip_type maniptype,
+                                     const struct nf_conn *ct,
+                                     u_int16_t *rover);
 
 extern int nf_nat_proto_range_to_nlattr(struct sk_buff *skb,
                                        const struct nf_nat_range *range);

diff --cc net/ipv4/netfilter/nf_nat_core.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_common.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_dccp.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_gre.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_icmp.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_sctp.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_tcp.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_udp.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_udplite.c
Simple merge

diff --cc net/ipv4/netfilter/nf_nat_proto_unknown.c
Simple merge