Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / net / netfilter / nf_conntrack_proto_tcp.c

diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c
index d87b642..5caa0c4 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -302,16 +302,16 @@ static bool tcp_invert_tuple(struct nf_conntrack_tuple *tuple,
 }
 
 /* Print out the per-protocol part of the tuple. */
-static int tcp_print_tuple(struct seq_file *s,
-                          const struct nf_conntrack_tuple *tuple)
+static void tcp_print_tuple(struct seq_file *s,
+                           const struct nf_conntrack_tuple *tuple)
 {
-       return seq_printf(s, "sport=%hu dport=%hu ",
-                         ntohs(tuple->src.u.tcp.port),
-                         ntohs(tuple->dst.u.tcp.port));
+       seq_printf(s, "sport=%hu dport=%hu ",
+                  ntohs(tuple->src.u.tcp.port),
+                  ntohs(tuple->dst.u.tcp.port));
 }
 
 /* Print out the private part of the conntrack. */
-static int tcp_print_conntrack(struct seq_file *s, struct nf_conn *ct)
+static void tcp_print_conntrack(struct seq_file *s, struct nf_conn *ct)
 {
        enum tcp_conntrack state;
 
@@ -319,7 +319,7 @@ static int tcp_print_conntrack(struct seq_file *s, struct nf_conn *ct)
        state = ct->proto.tcp.state;
        spin_unlock_bh(&ct->lock);
 
-       return seq_printf(s, "%s ", tcp_conntrack_names[state]);
+       seq_printf(s, "%s ", tcp_conntrack_names[state]);
 }
 
 static unsigned int get_conntrack_index(const struct tcphdr *tcph)