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_dccp.c
diff --git
a/net/netfilter/nf_conntrack_proto_dccp.c
b/net/netfilter/nf_conntrack_proto_dccp.c
index 6dd995c7c72b4400cdbd23da703467690f2e8cb4..fce1b1cca32d65c6241f0ee513db2fe5774a00b9 100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_dccp.c
+++ b/
net/netfilter/nf_conntrack_proto_dccp.c
@@
-398,7
+398,7
@@
static inline struct dccp_net *dccp_pernet(struct net *net)
}
static bool dccp_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)
{
struct dccp_hdr _hdr, *dh;