| Message ID | 1461892144-8638-1-git-send-email-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Apr 28, 2016 at 06:09:04PM -0700, Joe Stringer wrote: > Since commit f2ab1536ddbc ("compat: Backport conntrack strictly to > v3.10+."), we haven't supported these kernel versions. Remove the old > code. > > Signed-off-by: Joe Stringer <joe@ovn.org> Acked-by: Simon Horman <simon.horman@netronome.com>
On 2 May 2016 at 00:28, Simon Horman <simon.horman@netronome.com> wrote: > On Thu, Apr 28, 2016 at 06:09:04PM -0700, Joe Stringer wrote: >> Since commit f2ab1536ddbc ("compat: Backport conntrack strictly to >> v3.10+."), we haven't supported these kernel versions. Remove the old >> code. >> >> Signed-off-by: Joe Stringer <joe@ovn.org> > > Acked-by: Simon Horman <simon.horman@netronome.com> Thanks for the review, applied to msater.
diff --git a/datapath/linux/compat/skbuff-openvswitch.c b/datapath/linux/compat/skbuff-openvswitch.c index c46798df6816..5c32f8197dfe 100644 --- a/datapath/linux/compat/skbuff-openvswitch.c +++ b/datapath/linux/compat/skbuff-openvswitch.c @@ -23,11 +23,7 @@ void __skb_warn_lro_forwarding(const struct sk_buff *skb) static inline bool head_frag(const struct sk_buff *skb) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) return skb->head_frag; -#else - return false; -#endif } /** @@ -296,9 +292,7 @@ void rpl_skb_scrub_packet(struct sk_buff *skb, bool xnet) { skb->tstamp.tv64 = 0; skb->pkt_type = PACKET_HOST; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) skb->skb_iif = 0; -#endif skb->ignore_df = 0; skb_dst_drop(skb); secpath_reset(skb);
Since commit f2ab1536ddbc ("compat: Backport conntrack strictly to v3.10+."), we haven't supported these kernel versions. Remove the old code. Signed-off-by: Joe Stringer <joe@ovn.org> --- datapath/linux/compat/skbuff-openvswitch.c | 6 ------ 1 file changed, 6 deletions(-)