projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.4/reservations' of git://git.kernel.dk/linux-block
[firefly-linux-kernel-4.4.55.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 6957281ffee54fe43f22a73772b1f88a2e758a50..478f92f834b61e7e2007779dc9dd8cace98ffcd2 100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_udp.c
+++ b/
net/netfilter/nf_conntrack_proto_udp.c
@@
-38,6
+38,7
@@
static inline struct nf_udp_net *udp_pernet(struct net *net)
static bool udp_pkt_to_tuple(const struct sk_buff *skb,
unsigned int dataoff,
+ struct net *net,
struct nf_conntrack_tuple *tuple)
{
const struct udphdr *hp;