diff options
author | Jesse Gross <jesse@nicira.com> | 2011-06-23 17:10:00 -0700 |
---|---|---|
committer | Jesse Gross <jesse@nicira.com> | 2011-06-24 14:37:49 -0700 |
commit | 22bcc0e70becd88bf895c44885d63704affe4284 (patch) | |
tree | 4c29e6843c3972be5bced192a968217eb1c2190b /datapath/linux-2.6/compat-2.6/include/linux/ip.h | |
parent | 8c7ea6a0c0d44f707eef136b77ac0dd1c55509a4 (diff) |
datapath: Rename linux-2.6 and compat-2.6 directories.
The linux-2.6 and compat-2.6 directories apply equally to the upcoming
Linux 3.0 release, so this drops the 2.6 suffix and updates Makefiles.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'datapath/linux-2.6/compat-2.6/include/linux/ip.h')
-rw-r--r-- | datapath/linux-2.6/compat-2.6/include/linux/ip.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/ip.h b/datapath/linux-2.6/compat-2.6/include/linux/ip.h deleted file mode 100644 index 6ff71524..00000000 --- a/datapath/linux-2.6/compat-2.6/include/linux/ip.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __LINUX_IP_WRAPPER_H -#define __LINUX_IP_WRAPPER_H 1 - -#include_next <linux/ip.h> - -#ifndef HAVE_SKBUFF_HEADER_HELPERS -#include <linux/skbuff.h> -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 |