Merge branch 'topic/opal-ipmi' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe...

[firefly-linux-kernel-4.4.55.git] / net / netfilter / nf_conntrack_proto_dccp.c

diff --git a/net/netfilter/nf_conntrack_proto_dccp.c b/net/netfilter/nf_conntrack_proto_dccp.c
index cb372f96f10dc3c2f60064e49b86d35c76c6cd1b..6dd995c7c72b4400cdbd23da703467690f2e8cb4 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_dccp.c
+++ b/net/netfilter/nf_conntrack_proto_dccp.c
@@ -618,17 +618,17 @@ out_invalid:
        return -NF_ACCEPT;
 }
 
-static int dccp_print_tuple(struct seq_file *s,
-                           const struct nf_conntrack_tuple *tuple)
+static void dccp_print_tuple(struct seq_file *s,
+                            const struct nf_conntrack_tuple *tuple)
 {
-       return seq_printf(s, "sport=%hu dport=%hu ",
-                         ntohs(tuple->src.u.dccp.port),
-                         ntohs(tuple->dst.u.dccp.port));
+       seq_printf(s, "sport=%hu dport=%hu ",
+                  ntohs(tuple->src.u.dccp.port),
+                  ntohs(tuple->dst.u.dccp.port));
 }
 
-static int dccp_print_conntrack(struct seq_file *s, struct nf_conn *ct)
+static void dccp_print_conntrack(struct seq_file *s, struct nf_conn *ct)
 {
-       return seq_printf(s, "%s ", dccp_state_names[ct->proto.dccp.state]);
+       seq_printf(s, "%s ", dccp_state_names[ct->proto.dccp.state]);
 }
 
 #if IS_ENABLED(CONFIG_NF_CT_NETLINK)