From patchwork Fri Apr 29 01:09:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 616561 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3qwwZz38y2z9t3r for ; Fri, 29 Apr 2016 11:09:31 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 7EB4810896; Thu, 28 Apr 2016 18:09:30 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 5175A10871 for ; Thu, 28 Apr 2016 18:09:29 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id D39744200F1 for ; Thu, 28 Apr 2016 19:09:28 -0600 (MDT) X-ASG-Debug-ID: 1461892167-09eadd4044dab50001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id kTrpPV8gQEVWshZG (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 28 Apr 2016 19:09:27 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO relay5-d.mail.gandi.net) (217.70.183.197) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 29 Apr 2016 01:09:27 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.197 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.197 X-Barracuda-RBL-IP: 217.70.183.197 Received: from mfilter31-d.gandi.net (mfilter31-d.gandi.net [217.70.178.162]) by relay5-d.mail.gandi.net (Postfix) with ESMTP id 858F041C07D; Fri, 29 Apr 2016 03:09:25 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter31-d.gandi.net Received: from relay5-d.mail.gandi.net ([IPv6:::ffff:217.70.183.197]) by mfilter31-d.gandi.net (mfilter31-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id rG-h5chmXXrT; Fri, 29 Apr 2016 03:09:24 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from localhost.localdomain (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 4B5E441C088; Fri, 29 Apr 2016 03:09:23 +0200 (CEST) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-427094440 X-CudaMail-DTE: 042816 X-CudaMail-Originating-IP: 217.70.183.197 Date: Thu, 28 Apr 2016 18:09:04 -0700 X-ASG-Orig-Subj: [##CM-E1-427094440##][PATCH] compat: skbuff: Remove references to old kernels. Message-Id: <1461892144-8638-1-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.1.4 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1461892167 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH] compat: skbuff: Remove references to old kernels. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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 Acked-by: Simon Horman --- datapath/linux/compat/skbuff-openvswitch.c | 6 ------ 1 file changed, 6 deletions(-) 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);