projects
/
cascardo
/
ovs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25c7da8
)
datapath: Fix kernel-4.3 build.
author
Joe Stringer
<joe@ovn.org>
Tue, 2 Feb 2016 23:18:59 +0000
(15:18 -0800)
committer
Joe Stringer
<joe@ovn.org>
Thu, 4 Feb 2016 18:30:22 +0000
(10:30 -0800)
Commit
792e5ed750ce
("datapath: inet: frag: Always orphan skbs inside
ip_defrag().") broke the build for OVS backport against kernel-4.3. Fix
the build.
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
datapath/linux/compat/include/net/ip.h
patch
|
blob
|
history
diff --git
a/datapath/linux/compat/include/net/ip.h
b/datapath/linux/compat/include/net/ip.h
index
2e33664
..
29ec514
100644
(file)
--- a/
datapath/linux/compat/include/net/ip.h
+++ b/
datapath/linux/compat/include/net/ip.h
@@
-130,7
+130,7
@@
void rpl_ipfrag_fini(void);
static inline int rpl_ip_defrag(struct sk_buff *skb, u32 user)
{
skb_orphan(skb);
- ip_defrag(skb, user);
+
return
ip_defrag(skb, user);
}
#define ip_defrag rpl_ip_defrag
#endif