From patchwork Tue May 3 00:47:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 617721 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 3qzMwB3WGgz9t6n for ; Tue, 3 May 2016 10:47:54 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 028891059B; Mon, 2 May 2016 17:47:51 -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 C756F10587 for ; Mon, 2 May 2016 17:47:48 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 55ACA4202A2 for ; Mon, 2 May 2016 18:47:48 -0600 (MDT) X-ASG-Debug-ID: 1462236467-09eadd604299ba0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id ga4SxLGqxHHDr3lj (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 02 May 2016 18:47:47 -0600 (MDT) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO relay4-d.mail.gandi.net) (217.70.183.196) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 3 May 2016 00:47:47 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at ovn.org designates 217.70.183.196 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.196 X-Barracuda-RBL-IP: 217.70.183.196 Received: from mfilter30-d.gandi.net (mfilter30-d.gandi.net [217.70.178.161]) by relay4-d.mail.gandi.net (Postfix) with ESMTP id 1DB3C17209A; Tue, 3 May 2016 02:47:46 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mfilter30-d.gandi.net Received: from relay4-d.mail.gandi.net ([IPv6:::ffff:217.70.183.196]) by mfilter30-d.gandi.net (mfilter30-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id Z132LellfJIq; Tue, 3 May 2016 02:47:44 +0200 (CEST) X-Originating-IP: 208.91.1.34 Received: from localhost.localdomain (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 5EF06172098; Tue, 3 May 2016 02:47:43 +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-501088383 X-CudaMail-DTE: 050216 X-CudaMail-Originating-IP: 217.70.183.196 Date: Mon, 2 May 2016 17:47:33 -0700 X-ASG-Orig-Subj: [##CM-E1-501088383##][PATCH 2/2] compat: Remove skbuff header helper backports. Message-Id: <1462236453-27207-2-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1462236453-27207-1-git-send-email-joe@ovn.org> References: <1462236453-27207-1-git-send-email-joe@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1462236467 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 2/2] compat: Remove skbuff header helper backports. 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" These have existed largely since v2.6.22, so it's well overdue. Signed-off-by: Joe Stringer Acked-by: Jesse Gross --- acinclude.m4 | 4 -- datapath/linux/Modules.mk | 7 --- datapath/linux/compat/include/linux/icmp.h | 13 ------ datapath/linux/compat/include/linux/icmpv6.h | 13 ------ datapath/linux/compat/include/linux/if_arp.h | 15 ------- datapath/linux/compat/include/linux/ip.h | 20 --------- datapath/linux/compat/include/linux/ipv6.h | 7 --- datapath/linux/compat/include/linux/sctp.h | 13 ------ datapath/linux/compat/include/linux/skbuff.h | 65 ---------------------------- datapath/linux/compat/include/linux/tcp.h | 18 -------- datapath/linux/compat/include/linux/udp.h | 18 -------- 11 files changed, 193 deletions(-) delete mode 100644 datapath/linux/compat/include/linux/icmp.h delete mode 100644 datapath/linux/compat/include/linux/icmpv6.h delete mode 100644 datapath/linux/compat/include/linux/if_arp.h delete mode 100644 datapath/linux/compat/include/linux/ip.h delete mode 100644 datapath/linux/compat/include/linux/sctp.h delete mode 100644 datapath/linux/compat/include/linux/tcp.h delete mode 100644 datapath/linux/compat/include/linux/udp.h diff --git a/acinclude.m4 b/acinclude.m4 index f2a1ea6ad95f..23015fef1943 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -477,10 +477,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_reset_tail_pointer]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_cow_head]) - OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_transport_header], - [OVS_DEFINE([HAVE_SKBUFF_HEADER_HELPERS])]) - OVS_GREP_IFELSE([$KSRC/include/linux/icmpv6.h], [icmp6_hdr], - [OVS_DEFINE([HAVE_ICMP6_HDR])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_warn_if_lro], [OVS_DEFINE([HAVE_SKB_WARN_LRO])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [consume_skb]) diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index 7e334cbf030a..5d38766d0dae 100644 --- a/datapath/linux/Modules.mk +++ b/datapath/linux/Modules.mk @@ -37,15 +37,11 @@ openvswitch_headers += \ linux/compat/include/linux/err.h \ linux/compat/include/linux/etherdevice.h \ linux/compat/include/linux/flex_array.h \ - linux/compat/include/linux/icmp.h \ - linux/compat/include/linux/icmpv6.h \ linux/compat/include/linux/if.h \ - linux/compat/include/linux/if_arp.h \ linux/compat/include/linux/if_ether.h \ linux/compat/include/linux/if_link.h \ linux/compat/include/linux/if_vlan.h \ linux/compat/include/linux/in.h \ - linux/compat/include/linux/ip.h \ linux/compat/include/linux/ipv6.h \ linux/compat/include/linux/jiffies.h \ linux/compat/include/linux/kconfig.h \ @@ -65,13 +61,10 @@ openvswitch_headers += \ linux/compat/include/linux/rcupdate.h \ linux/compat/include/linux/reciprocal_div.h \ linux/compat/include/linux/rtnetlink.h \ - linux/compat/include/linux/sctp.h \ linux/compat/include/linux/skbuff.h \ linux/compat/include/linux/stddef.h \ - linux/compat/include/linux/tcp.h \ linux/compat/include/linux/types.h \ linux/compat/include/linux/u64_stats_sync.h \ - linux/compat/include/linux/udp.h \ linux/compat/include/linux/workqueue.h \ linux/compat/include/net/checksum.h \ linux/compat/include/net/dst.h \ diff --git a/datapath/linux/compat/include/linux/icmp.h b/datapath/linux/compat/include/linux/icmp.h deleted file mode 100644 index 4be4d2b61d05..000000000000 --- a/datapath/linux/compat/include/linux/icmp.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __LINUX_ICMP_WRAPPER_H -#define __LINUX_ICMP_WRAPPER_H 1 - -#include_next - -#ifndef HAVE_SKBUFF_HEADER_HELPERS -static inline struct icmphdr *icmp_hdr(const struct sk_buff *skb) -{ - return (struct icmphdr *)skb_transport_header(skb); -} -#endif - -#endif diff --git a/datapath/linux/compat/include/linux/icmpv6.h b/datapath/linux/compat/include/linux/icmpv6.h deleted file mode 100644 index 06d91b395283..000000000000 --- a/datapath/linux/compat/include/linux/icmpv6.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __LINUX_ICMPV6_WRAPPER_H -#define __LINUX_ICMPV6_WRAPPER_H 1 - -#include_next - -#ifndef HAVE_ICMP6_HDR -static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb) -{ - return (struct icmp6hdr *)skb_transport_header(skb); -} -#endif - -#endif diff --git a/datapath/linux/compat/include/linux/if_arp.h b/datapath/linux/compat/include/linux/if_arp.h deleted file mode 100644 index e48d6ba0d760..000000000000 --- a/datapath/linux/compat/include/linux/if_arp.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef __LINUX_IF_ARP_WRAPPER_H -#define __LINUX_IF_ARP_WRAPPER_H 1 - -#include_next - -#ifndef HAVE_SKBUFF_HEADER_HELPERS -#include - -static inline struct arphdr *arp_hdr(const struct sk_buff *skb) -{ - return (struct arphdr *)skb_network_header(skb); -} -#endif /* !HAVE_SKBUFF_HEADER_HELPERS */ - -#endif diff --git a/datapath/linux/compat/include/linux/ip.h b/datapath/linux/compat/include/linux/ip.h deleted file mode 100644 index c64306e08084..000000000000 --- a/datapath/linux/compat/include/linux/ip.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __LINUX_IP_WRAPPER_H -#define __LINUX_IP_WRAPPER_H 1 - -#include_next - -#ifndef HAVE_SKBUFF_HEADER_HELPERS -#include - -static inline struct iphdr *ip_hdr(const struct sk_buff *skb) -{ - return (struct iphdr *)skb_network_header(skb); -} - -static inline unsigned int ip_hdrlen(const struct sk_buff *skb) -{ - return ip_hdr(skb)->ihl * 4; -} -#endif /* !HAVE_SKBUFF_HEADER_HELPERS */ - -#endif diff --git a/datapath/linux/compat/include/linux/ipv6.h b/datapath/linux/compat/include/linux/ipv6.h index 0971c56eb6a9..8a79f9c0e6a8 100644 --- a/datapath/linux/compat/include/linux/ipv6.h +++ b/datapath/linux/compat/include/linux/ipv6.h @@ -6,13 +6,6 @@ struct frag_queue; struct inet_frags; -#ifndef HAVE_SKBUFF_HEADER_HELPERS -static inline struct ipv6hdr *ipv6_hdr(const struct sk_buff *skb) -{ - return (struct ipv6hdr *)skb_network_header(skb); -} -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0) void rpl_ip6_expire_frag_queue(struct net *net, struct frag_queue *fq, struct inet_frags *frags); diff --git a/datapath/linux/compat/include/linux/sctp.h b/datapath/linux/compat/include/linux/sctp.h deleted file mode 100644 index b91c9c69d9ff..000000000000 --- a/datapath/linux/compat/include/linux/sctp.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef __LINUX_SCTP_WRAPPER_H -#define __LINUX_SCTP_WRAPPER_H 1 - -#include_next - -#ifndef HAVE_SKBUFF_HEADER_HELPERS -static inline struct sctphdr *sctp_hdr(const struct sk_buff *skb) -{ - return (struct sctphdr *)skb_transport_header(skb); -} -#endif /* HAVE_SKBUFF_HEADER_HELPERS */ - -#endif diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h index ab54a83faf17..376dfda8a825 100644 --- a/datapath/linux/compat/include/linux/skbuff.h +++ b/datapath/linux/compat/include/linux/skbuff.h @@ -111,71 +111,6 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb) #define CHECKSUM_COMPLETE CHECKSUM_HW #endif -#ifndef HAVE_SKBUFF_HEADER_HELPERS -static inline unsigned char *skb_transport_header(const struct sk_buff *skb) -{ - return skb->h.raw; -} - -static inline void skb_reset_transport_header(struct sk_buff *skb) -{ - skb->h.raw = skb->data; -} - -static inline void skb_set_transport_header(struct sk_buff *skb, - const int offset) -{ - skb->h.raw = skb->data + offset; -} - -static inline unsigned char *skb_network_header(const struct sk_buff *skb) -{ - return skb->nh.raw; -} - -static inline void skb_reset_network_header(struct sk_buff *skb) -{ - skb->nh.raw = skb->data; -} - -static inline void skb_set_network_header(struct sk_buff *skb, const int offset) -{ - skb->nh.raw = skb->data + offset; -} - -static inline unsigned char *skb_mac_header(const struct sk_buff *skb) -{ - return skb->mac.raw; -} - -static inline void skb_reset_mac_header(struct sk_buff *skb) -{ - skb->mac_header = skb->data; -} - -static inline void skb_set_mac_header(struct sk_buff *skb, const int offset) -{ - skb->mac.raw = skb->data + offset; -} - -static inline int skb_transport_offset(const struct sk_buff *skb) -{ - return skb_transport_header(skb) - skb->data; -} - -static inline int skb_network_offset(const struct sk_buff *skb) -{ - return skb_network_header(skb) - skb->data; -} - -static inline void skb_copy_to_linear_data(struct sk_buff *skb, - const void *from, - const unsigned int len) -{ - memcpy(skb->data, from, len); -} -#endif /* !HAVE_SKBUFF_HEADER_HELPERS */ - #ifndef HAVE_SKB_WARN_LRO #ifndef NETIF_F_LRO static inline bool skb_warn_if_lro(const struct sk_buff *skb) diff --git a/datapath/linux/compat/include/linux/tcp.h b/datapath/linux/compat/include/linux/tcp.h deleted file mode 100644 index 9260b191bd4a..000000000000 --- a/datapath/linux/compat/include/linux/tcp.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __LINUX_TCP_WRAPPER_H -#define __LINUX_TCP_WRAPPER_H 1 - -#include_next - -#ifndef HAVE_SKBUFF_HEADER_HELPERS -static inline struct tcphdr *tcp_hdr(const struct sk_buff *skb) -{ - return (struct tcphdr *)skb_transport_header(skb); -} - -static inline unsigned int tcp_hdrlen(const struct sk_buff *skb) -{ - return tcp_hdr(skb)->doff * 4; -} -#endif /* !HAVE_SKBUFF_HEADER_HELPERS */ - -#endif diff --git a/datapath/linux/compat/include/linux/udp.h b/datapath/linux/compat/include/linux/udp.h deleted file mode 100644 index 6a805b58ea6f..000000000000 --- a/datapath/linux/compat/include/linux/udp.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __LINUX_UDP_WRAPPER_H -#define __LINUX_UDP_WRAPPER_H 1 - -#include_next - -#ifndef HAVE_SKBUFF_HEADER_HELPERS -static inline struct udphdr *udp_hdr(const struct sk_buff *skb) -{ - return (struct udphdr *)skb_transport_header(skb); -} -#endif /* HAVE_SKBUFF_HEADER_HELPERS */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,5,0) -static inline void udp_encap_enable(void) -{ -} -#endif -#endif