projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[cascardo/linux.git]
/
net
/
netfilter
/
nf_conntrack_proto_udp.c
diff --git
a/net/netfilter/nf_conntrack_proto_udp.c
b/net/netfilter/nf_conntrack_proto_udp.c
index
9d7721c
..
6957281
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_udp.c
+++ b/
net/netfilter/nf_conntrack_proto_udp.c
@@
-63,12
+63,12
@@
static bool udp_invert_tuple(struct nf_conntrack_tuple *tuple,
}
/* Print out the per-protocol part of the tuple. */
}
/* Print out the per-protocol part of the tuple. */
-static
int
udp_print_tuple(struct seq_file *s,
- const struct nf_conntrack_tuple *tuple)
+static
void
udp_print_tuple(struct seq_file *s,
+
const struct nf_conntrack_tuple *tuple)
{
{
-
return
seq_printf(s, "sport=%hu dport=%hu ",
-
ntohs(tuple->src.u.udp.port),
-
ntohs(tuple->dst.u.udp.port));
+ seq_printf(s, "sport=%hu dport=%hu ",
+ ntohs(tuple->src.u.udp.port),
+ ntohs(tuple->dst.u.udp.port));
}
static unsigned int *udp_get_timeouts(struct net *net)
}
static unsigned int *udp_get_timeouts(struct net *net)