From: Ben Pfaff <blp@nicira.com>
Date: Fri, 10 Dec 2010 22:39:25 +0000 (-0800)
Subject: datapath: Include <linux/skbuff.h> directly into linux/ip.h compat.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f94f8fa2fe53e241b6417056e04d45ca7b577f5;p=openvswitch

datapath: Include <linux/skbuff.h> directly into linux/ip.h compat.

While doing test builds on numerous kernel versions I found that one build
failed because skb_network_header() wasn't visible from flow.h.  I guess
that we accidentally depend on <linux/netlink.h> being included indirectly,
but this didn't always happen.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
---

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
index 36765396..6ff71524 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/ip.h
+++ b/datapath/linux-2.6/compat-2.6/include/linux/ip.h
@@ -4,6 +4,7 @@
 #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);