projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'vexpress-for-v4.6/dt-updates-2' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
net
/
ipv4
/
netfilter
/
nf_defrag_ipv4.c
diff --git
a/net/ipv4/netfilter/nf_defrag_ipv4.c
b/net/ipv4/netfilter/nf_defrag_ipv4.c
index
6fb869f
..
a04dee5
100644
(file)
--- a/
net/ipv4/netfilter/nf_defrag_ipv4.c
+++ b/
net/ipv4/netfilter/nf_defrag_ipv4.c
@@
-27,8
+27,6
@@
static int nf_ct_ipv4_gather_frags(struct net *net, struct sk_buff *skb,
{
int err;
- skb_orphan(skb);
-
local_bh_disable();
err = ip_defrag(net, skb, user);
local_bh_enable();