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_generic.c
diff --git
a/net/netfilter/nf_conntrack_proto_generic.c
b/net/netfilter/nf_conntrack_proto_generic.c
index 2281be419a74b6d8abe0fd7da8d7e8b35d304600..86dc752e534963b08c7fc4217db533c480042d17 100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_generic.c
+++ b/
net/netfilter/nf_conntrack_proto_generic.c
@@
-45,7
+45,7
@@
static inline struct nf_generic_net *generic_pernet(struct net *net)
static bool generic_pkt_to_tuple(const struct sk_buff *skb,
unsigned int dataoff,
- struct nf_conntrack_tuple *tuple)
+ struct n
et *net, struct n
f_conntrack_tuple *tuple)
{
tuple->src.u.all = 0;
tuple->dst.u.all = 0;