[ovs-dev] [PATCH] datapath: Rename linux-2.6 and compat-2.6 directories.

Jesse Gross jesse at nicira.com
Fri Jun 24 00:24:39 UTC 2011


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 at nicira.com>
---
 INSTALL.Linux                                      |    4 +-
 INSTALL.bridge                                     |    2 +-
 acinclude.m4                                       |   16 +++---
 configure.ac                                       |    6 +-
 datapath/Makefile.am                               |    4 +-
 datapath/linux-2.6/Modules.mk                      |   62 --------------------
 datapath/{linux-2.6 => linux}/.gitignore           |    0
 datapath/{linux-2.6 => linux}/Kbuild.in            |    2 +-
 datapath/{linux-2.6 => linux}/Makefile.in          |    0
 datapath/{linux-2.6 => linux}/Makefile.main.in     |    0
 datapath/linux/Modules.mk                          |   62 ++++++++++++++++++++
 .../compat}/addrconf_core-openvswitch.c            |    0
 .../compat-2.6 => linux/compat}/dev-openvswitch.c  |    0
 .../compat}/genetlink-brcompat.c                   |    0
 .../compat}/genetlink-openvswitch.c                |    0
 .../compat-2.6 => linux/compat}/genetlink.inc      |    0
 .../compat}/include/asm-generic/bug.h              |    0
 .../compat}/include/linux/bottom_half.h            |    0
 .../compat}/include/linux/compiler-gcc.h           |    0
 .../compat}/include/linux/compiler.h               |    0
 .../compat}/include/linux/cpumask.h                |    0
 .../compat}/include/linux/dmi.h                    |    0
 .../compat}/include/linux/err.h                    |    0
 .../compat}/include/linux/genetlink.h              |    0
 .../compat}/include/linux/icmp.h                   |    0
 .../compat}/include/linux/icmpv6.h                 |    0
 .../compat-2.6 => linux/compat}/include/linux/if.h |    0
 .../compat}/include/linux/if_arp.h                 |    0
 .../compat}/include/linux/if_ether.h               |    0
 .../compat}/include/linux/if_vlan.h                |    0
 .../compat-2.6 => linux/compat}/include/linux/in.h |    0
 .../compat}/include/linux/inetdevice.h             |    0
 .../compat-2.6 => linux/compat}/include/linux/ip.h |    0
 .../compat}/include/linux/ipv6.h                   |    0
 .../compat}/include/linux/jiffies.h                |    0
 .../compat}/include/linux/kernel.h                 |    0
 .../compat}/include/linux/kobject.h                |    0
 .../compat}/include/linux/lockdep.h                |    0
 .../compat}/include/linux/log2.h                   |    0
 .../compat}/include/linux/mutex.h                  |    0
 .../compat}/include/linux/netdevice.h              |    0
 .../compat}/include/linux/netfilter_bridge.h       |    0
 .../compat}/include/linux/netfilter_ipv4.h         |    0
 .../compat}/include/linux/netlink.h                |    0
 .../compat}/include/linux/rculist.h                |    0
 .../compat}/include/linux/rcupdate.h               |    0
 .../compat}/include/linux/rtnetlink.h              |    0
 .../compat}/include/linux/skbuff.h                 |    0
 .../compat}/include/linux/slab.h                   |    0
 .../compat}/include/linux/stddef.h                 |    0
 .../compat}/include/linux/tcp.h                    |    0
 .../compat}/include/linux/timer.h                  |    0
 .../compat}/include/linux/types.h                  |    0
 .../compat}/include/linux/udp.h                    |    0
 .../compat}/include/linux/workqueue.h              |    0
 .../compat}/include/net/checksum.h                 |    0
 .../compat-2.6 => linux/compat}/include/net/dst.h  |    0
 .../compat}/include/net/genetlink.h                |    0
 .../compat-2.6 => linux/compat}/include/net/ip.h   |    0
 .../compat}/include/net/net_namespace.h            |    0
 .../compat}/include/net/netlink.h                  |    0
 .../compat}/include/net/protocol.h                 |    0
 .../compat}/include/net/route.h                    |    0
 .../compat}/ip_output-openvswitch.c                |    0
 .../compat-2.6 => linux/compat}/kmemdup.c          |    0
 .../compat-2.6 => linux/compat}/netdevice.c        |    0
 .../compat}/skbuff-openvswitch.c                   |    0
 .../{linux-2.6/compat-2.6 => linux/compat}/time.c  |    0
 68 files changed, 79 insertions(+), 79 deletions(-)
 delete mode 100644 datapath/linux-2.6/Modules.mk
 rename datapath/{linux-2.6 => linux}/.gitignore (100%)
 rename datapath/{linux-2.6 => linux}/Kbuild.in (90%)
 rename datapath/{linux-2.6 => linux}/Makefile.in (100%)
 rename datapath/{linux-2.6 => linux}/Makefile.main.in (100%)
 create mode 100644 datapath/linux/Modules.mk
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/addrconf_core-openvswitch.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/dev-openvswitch.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/genetlink-brcompat.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/genetlink-openvswitch.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/genetlink.inc (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/asm-generic/bug.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/bottom_half.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/compiler-gcc.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/compiler.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/cpumask.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/dmi.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/err.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/genetlink.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/icmp.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/icmpv6.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/if.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/if_arp.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/if_ether.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/if_vlan.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/in.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/inetdevice.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/ip.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/ipv6.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/jiffies.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/kernel.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/kobject.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/lockdep.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/log2.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/mutex.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/netdevice.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/netfilter_bridge.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/netfilter_ipv4.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/netlink.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/rculist.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/rcupdate.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/rtnetlink.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/skbuff.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/slab.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/stddef.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/tcp.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/timer.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/types.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/udp.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/linux/workqueue.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/checksum.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/dst.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/genetlink.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/ip.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/net_namespace.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/netlink.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/protocol.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/include/net/route.h (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/ip_output-openvswitch.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/kmemdup.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/netdevice.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/skbuff-openvswitch.c (100%)
 rename datapath/{linux-2.6/compat-2.6 => linux/compat}/time.c (100%)

diff --git a/INSTALL.Linux b/INSTALL.Linux
index 318c9a7..c7e4ed9 100644
--- a/INSTALL.Linux
+++ b/INSTALL.Linux
@@ -182,7 +182,7 @@ Prerequisites section, follow the procedure below to build.
    when invoking the configure script.  For example, to build for MIPS
    with Linux:
 
-      % ./configure --with-linux=/path/to/linux-2.6 KARCH=mips
+      % ./configure --with-linux=/path/to/linux KARCH=mips
 
    The configure script accepts a number of other options and honors
    additional environment variables.  For a full list, invoke
@@ -199,7 +199,7 @@ Prerequisites section, follow the procedure below to build.
 
 6. If you built kernel modules, you may load them with "insmod", e.g.:
 
-      % insmod datapath/linux-2.6/openvswitch_mod.ko
+      % insmod datapath/linux/openvswitch_mod.ko
 
    You may need to specify a full path to insmod, e.g. /sbin/insmod.
    To verify that the modules have been loaded, run "/sbin/lsmod" and
diff --git a/INSTALL.bridge b/INSTALL.bridge
index 8e65021..650e776 100644
--- a/INSTALL.bridge
+++ b/INSTALL.bridge
@@ -34,7 +34,7 @@ kernel bridge module.
 
 2. Load the brcompat kernel module (which was built in step 1), e.g.:
 
-      % insmod datapath/linux-2.6/brcompat_mod.ko
+      % insmod datapath/linux/brcompat_mod.ko
 
    (openvswitch_mod.ko should already have been loaded.)
 
diff --git a/acinclude.m4 b/acinclude.m4
index fc7155f..1618a43 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -180,7 +180,7 @@ dnl OVS_DEFINE(NAME)
 dnl
 dnl Defines NAME to 1 in kcompat.h.
 AC_DEFUN([OVS_DEFINE], [
-  echo '#define $1 1' >> datapath/linux-2.6/kcompat.h.new
+  echo '#define $1 1' >> datapath/linux/kcompat.h.new
 ])
 
 AC_DEFUN([OVS_CHECK_LOG2_H], [
@@ -198,9 +198,9 @@ dnl
 dnl Runs various Autoconf checks on the Linux 2.6 kernel source in
 dnl the directory in $KBUILD.
 AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
-  rm -f datapath/linux-2.6/kcompat.h.new
-  mkdir -p datapath/linux-2.6
-  : > datapath/linux-2.6/kcompat.h.new
+  rm -f datapath/linux/kcompat.h.new
+  mkdir -p datapath/linux
+  : > datapath/linux/kcompat.h.new
 
   OVS_GREP_IFELSE([$KSRC/arch/x86/include/asm/checksum_32.h], [src_err,],
                   [OVS_DEFINE([HAVE_CSUM_COPY_DBG])])
@@ -261,11 +261,11 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
 
   OVS_CHECK_LOG2_H
 
-  if cmp -s datapath/linux-2.6/kcompat.h.new \
-            datapath/linux-2.6/kcompat.h >/dev/null 2>&1; then
-    rm datapath/linux-2.6/kcompat.h.new
+  if cmp -s datapath/linux/kcompat.h.new \
+            datapath/linux/kcompat.h >/dev/null 2>&1; then
+    rm datapath/linux/kcompat.h.new
   else
-    mv datapath/linux-2.6/kcompat.h.new datapath/linux-2.6/kcompat.h
+    mv datapath/linux/kcompat.h.new datapath/linux/kcompat.h
   fi
 ])
 
diff --git a/configure.ac b/configure.ac
index 0cf6863..046b386 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,9 +94,9 @@ OVS_CHECK_LINUX
 
 AC_CONFIG_FILES([Makefile 
 datapath/Makefile 
-datapath/linux-2.6/Kbuild
-datapath/linux-2.6/Makefile
-datapath/linux-2.6/Makefile.main
+datapath/linux/Kbuild
+datapath/linux/Makefile
+datapath/linux/Makefile.main
 tests/atlocal])
 
 dnl This makes sure that include/openflow gets created in the build directory.
diff --git a/datapath/Makefile.am b/datapath/Makefile.am
index 5c5bc21..e1bd3e6 100644
--- a/datapath/Makefile.am
+++ b/datapath/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = 
 if LINUX_ENABLED
-SUBDIRS += linux-2.6
+SUBDIRS += linux
 endif
 
 EXTRA_DIST = $(dist_headers) $(dist_sources)
@@ -9,7 +9,7 @@ EXTRA_DIST = $(dist_headers) $(dist_sources)
 AUTOMAKE_OPTIONS = -Wno-portability
 
 include Modules.mk
-include linux-2.6/Modules.mk
+include linux/Modules.mk
 
 # The following is based on commands for the Automake "distdir" target.
 distfiles: Makefile
diff --git a/datapath/linux-2.6/Modules.mk b/datapath/linux-2.6/Modules.mk
deleted file mode 100644
index 3fb9e9b..0000000
--- a/datapath/linux-2.6/Modules.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-openvswitch_sources += \
-	linux-2.6/compat-2.6/addrconf_core-openvswitch.c \
-	linux-2.6/compat-2.6/dev-openvswitch.c \
-	linux-2.6/compat-2.6/genetlink-openvswitch.c \
-	linux-2.6/compat-2.6/ip_output-openvswitch.c \
-	linux-2.6/compat-2.6/kmemdup.c \
-	linux-2.6/compat-2.6/netdevice.c \
-	linux-2.6/compat-2.6/skbuff-openvswitch.c \
-	linux-2.6/compat-2.6/time.c
-openvswitch_headers += \
-	linux-2.6/compat-2.6/include/asm-generic/bug.h \
-	linux-2.6/compat-2.6/include/linux/bottom_half.h \
-	linux-2.6/compat-2.6/include/linux/compiler.h \
-	linux-2.6/compat-2.6/include/linux/compiler-gcc.h \
-	linux-2.6/compat-2.6/include/linux/cpumask.h \
-	linux-2.6/compat-2.6/include/linux/dmi.h \
-	linux-2.6/compat-2.6/include/linux/err.h \
-	linux-2.6/compat-2.6/include/linux/genetlink.h \
-	linux-2.6/compat-2.6/include/linux/icmp.h \
-	linux-2.6/compat-2.6/include/linux/icmpv6.h \
-	linux-2.6/compat-2.6/include/linux/if.h \
-	linux-2.6/compat-2.6/include/linux/if_arp.h \
-	linux-2.6/compat-2.6/include/linux/if_ether.h \
-	linux-2.6/compat-2.6/include/linux/if_vlan.h \
-	linux-2.6/compat-2.6/include/linux/in.h \
-	linux-2.6/compat-2.6/include/linux/inetdevice.h \
-	linux-2.6/compat-2.6/include/linux/ip.h \
-	linux-2.6/compat-2.6/include/linux/ipv6.h \
-	linux-2.6/compat-2.6/include/linux/jiffies.h \
-	linux-2.6/compat-2.6/include/linux/kernel.h \
-	linux-2.6/compat-2.6/include/linux/kobject.h \
-	linux-2.6/compat-2.6/include/linux/lockdep.h \
-	linux-2.6/compat-2.6/include/linux/log2.h \
-	linux-2.6/compat-2.6/include/linux/mutex.h \
-	linux-2.6/compat-2.6/include/linux/netdevice.h \
-	linux-2.6/compat-2.6/include/linux/netfilter_bridge.h \
-	linux-2.6/compat-2.6/include/linux/netfilter_ipv4.h \
-	linux-2.6/compat-2.6/include/linux/netlink.h \
-	linux-2.6/compat-2.6/include/linux/rculist.h \
-	linux-2.6/compat-2.6/include/linux/rcupdate.h \
-	linux-2.6/compat-2.6/include/linux/rtnetlink.h \
-	linux-2.6/compat-2.6/include/linux/skbuff.h \
-	linux-2.6/compat-2.6/include/linux/slab.h \
-	linux-2.6/compat-2.6/include/linux/stddef.h \
-	linux-2.6/compat-2.6/include/linux/tcp.h \
-	linux-2.6/compat-2.6/include/linux/timer.h \
-	linux-2.6/compat-2.6/include/linux/types.h \
-	linux-2.6/compat-2.6/include/linux/udp.h \
-	linux-2.6/compat-2.6/include/linux/workqueue.h \
-	linux-2.6/compat-2.6/include/net/checksum.h \
-	linux-2.6/compat-2.6/include/net/dst.h \
-	linux-2.6/compat-2.6/include/net/genetlink.h \
-	linux-2.6/compat-2.6/include/net/ip.h \
-	linux-2.6/compat-2.6/include/net/net_namespace.h \
-	linux-2.6/compat-2.6/include/net/netlink.h \
-	linux-2.6/compat-2.6/include/net/protocol.h \
-	linux-2.6/compat-2.6/include/net/route.h \
-	linux-2.6/compat-2.6/genetlink.inc
-
-both_modules += brcompat
-brcompat_sources = linux-2.6/compat-2.6/genetlink-brcompat.c brcompat.c
-brcompat_headers =
diff --git a/datapath/linux-2.6/.gitignore b/datapath/linux/.gitignore
similarity index 100%
rename from datapath/linux-2.6/.gitignore
rename to datapath/linux/.gitignore
diff --git a/datapath/linux-2.6/Kbuild.in b/datapath/linux/Kbuild.in
similarity index 90%
rename from datapath/linux-2.6/Kbuild.in
rename to datapath/linux/Kbuild.in
index 2158382..5e9b758 100644
--- a/datapath/linux-2.6/Kbuild.in
+++ b/datapath/linux/Kbuild.in
@@ -22,7 +22,7 @@ EXTRA_CFLAGS += -include $(builddir)/kcompat.h
 # These include directories have to go before -I$(KSRC)/include.
 # NOSTDINC_FLAGS just happens to be a variable that goes in the
 # right place, even though it's conceptually incorrect.
-NOSTDINC_FLAGS += -I$(top_srcdir)/include -I$(srcdir)/compat-2.6 -I$(srcdir)/compat-2.6/include 
+NOSTDINC_FLAGS += -I$(top_srcdir)/include -I$(srcdir)/compat -I$(srcdir)/compat/include 
 
 obj-m := $(patsubst %,%_mod.o,$(build_modules))
 
diff --git a/datapath/linux-2.6/Makefile.in b/datapath/linux/Makefile.in
similarity index 100%
rename from datapath/linux-2.6/Makefile.in
rename to datapath/linux/Makefile.in
diff --git a/datapath/linux-2.6/Makefile.main.in b/datapath/linux/Makefile.main.in
similarity index 100%
rename from datapath/linux-2.6/Makefile.main.in
rename to datapath/linux/Makefile.main.in
diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk
new file mode 100644
index 0000000..217f12d
--- /dev/null
+++ b/datapath/linux/Modules.mk
@@ -0,0 +1,62 @@
+openvswitch_sources += \
+	linux/compat/addrconf_core-openvswitch.c \
+	linux/compat/dev-openvswitch.c \
+	linux/compat/genetlink-openvswitch.c \
+	linux/compat/ip_output-openvswitch.c \
+	linux/compat/kmemdup.c \
+	linux/compat/netdevice.c \
+	linux/compat/skbuff-openvswitch.c \
+	linux/compat/time.c
+openvswitch_headers += \
+	linux/compat/include/asm-generic/bug.h \
+	linux/compat/include/linux/bottom_half.h \
+	linux/compat/include/linux/compiler.h \
+	linux/compat/include/linux/compiler-gcc.h \
+	linux/compat/include/linux/cpumask.h \
+	linux/compat/include/linux/dmi.h \
+	linux/compat/include/linux/err.h \
+	linux/compat/include/linux/genetlink.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_vlan.h \
+	linux/compat/include/linux/in.h \
+	linux/compat/include/linux/inetdevice.h \
+	linux/compat/include/linux/ip.h \
+	linux/compat/include/linux/ipv6.h \
+	linux/compat/include/linux/jiffies.h \
+	linux/compat/include/linux/kernel.h \
+	linux/compat/include/linux/kobject.h \
+	linux/compat/include/linux/lockdep.h \
+	linux/compat/include/linux/log2.h \
+	linux/compat/include/linux/mutex.h \
+	linux/compat/include/linux/netdevice.h \
+	linux/compat/include/linux/netfilter_bridge.h \
+	linux/compat/include/linux/netfilter_ipv4.h \
+	linux/compat/include/linux/netlink.h \
+	linux/compat/include/linux/rculist.h \
+	linux/compat/include/linux/rcupdate.h \
+	linux/compat/include/linux/rtnetlink.h \
+	linux/compat/include/linux/skbuff.h \
+	linux/compat/include/linux/slab.h \
+	linux/compat/include/linux/stddef.h \
+	linux/compat/include/linux/tcp.h \
+	linux/compat/include/linux/timer.h \
+	linux/compat/include/linux/types.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 \
+	linux/compat/include/net/genetlink.h \
+	linux/compat/include/net/ip.h \
+	linux/compat/include/net/net_namespace.h \
+	linux/compat/include/net/netlink.h \
+	linux/compat/include/net/protocol.h \
+	linux/compat/include/net/route.h \
+	linux/compat/genetlink.inc
+
+both_modules += brcompat
+brcompat_sources = linux/compat/genetlink-brcompat.c brcompat.c
+brcompat_headers =
diff --git a/datapath/linux-2.6/compat-2.6/addrconf_core-openvswitch.c b/datapath/linux/compat/addrconf_core-openvswitch.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/addrconf_core-openvswitch.c
rename to datapath/linux/compat/addrconf_core-openvswitch.c
diff --git a/datapath/linux-2.6/compat-2.6/dev-openvswitch.c b/datapath/linux/compat/dev-openvswitch.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/dev-openvswitch.c
rename to datapath/linux/compat/dev-openvswitch.c
diff --git a/datapath/linux-2.6/compat-2.6/genetlink-brcompat.c b/datapath/linux/compat/genetlink-brcompat.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/genetlink-brcompat.c
rename to datapath/linux/compat/genetlink-brcompat.c
diff --git a/datapath/linux-2.6/compat-2.6/genetlink-openvswitch.c b/datapath/linux/compat/genetlink-openvswitch.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/genetlink-openvswitch.c
rename to datapath/linux/compat/genetlink-openvswitch.c
diff --git a/datapath/linux-2.6/compat-2.6/genetlink.inc b/datapath/linux/compat/genetlink.inc
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/genetlink.inc
rename to datapath/linux/compat/genetlink.inc
diff --git a/datapath/linux-2.6/compat-2.6/include/asm-generic/bug.h b/datapath/linux/compat/include/asm-generic/bug.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/asm-generic/bug.h
rename to datapath/linux/compat/include/asm-generic/bug.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/bottom_half.h b/datapath/linux/compat/include/linux/bottom_half.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/bottom_half.h
rename to datapath/linux/compat/include/linux/bottom_half.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/compiler-gcc.h b/datapath/linux/compat/include/linux/compiler-gcc.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/compiler-gcc.h
rename to datapath/linux/compat/include/linux/compiler-gcc.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/compiler.h b/datapath/linux/compat/include/linux/compiler.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/compiler.h
rename to datapath/linux/compat/include/linux/compiler.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/cpumask.h b/datapath/linux/compat/include/linux/cpumask.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/cpumask.h
rename to datapath/linux/compat/include/linux/cpumask.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/dmi.h b/datapath/linux/compat/include/linux/dmi.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/dmi.h
rename to datapath/linux/compat/include/linux/dmi.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/err.h b/datapath/linux/compat/include/linux/err.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/err.h
rename to datapath/linux/compat/include/linux/err.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/genetlink.h b/datapath/linux/compat/include/linux/genetlink.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/genetlink.h
rename to datapath/linux/compat/include/linux/genetlink.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/icmp.h b/datapath/linux/compat/include/linux/icmp.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/icmp.h
rename to datapath/linux/compat/include/linux/icmp.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/icmpv6.h b/datapath/linux/compat/include/linux/icmpv6.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/icmpv6.h
rename to datapath/linux/compat/include/linux/icmpv6.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/if.h b/datapath/linux/compat/include/linux/if.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/if.h
rename to datapath/linux/compat/include/linux/if.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/if_arp.h b/datapath/linux/compat/include/linux/if_arp.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/if_arp.h
rename to datapath/linux/compat/include/linux/if_arp.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/if_ether.h b/datapath/linux/compat/include/linux/if_ether.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/if_ether.h
rename to datapath/linux/compat/include/linux/if_ether.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h b/datapath/linux/compat/include/linux/if_vlan.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h
rename to datapath/linux/compat/include/linux/if_vlan.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/in.h b/datapath/linux/compat/include/linux/in.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/in.h
rename to datapath/linux/compat/include/linux/in.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/inetdevice.h b/datapath/linux/compat/include/linux/inetdevice.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/inetdevice.h
rename to datapath/linux/compat/include/linux/inetdevice.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/ip.h b/datapath/linux/compat/include/linux/ip.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/ip.h
rename to datapath/linux/compat/include/linux/ip.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/ipv6.h b/datapath/linux/compat/include/linux/ipv6.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/ipv6.h
rename to datapath/linux/compat/include/linux/ipv6.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/jiffies.h b/datapath/linux/compat/include/linux/jiffies.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/jiffies.h
rename to datapath/linux/compat/include/linux/jiffies.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/kernel.h b/datapath/linux/compat/include/linux/kernel.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/kernel.h
rename to datapath/linux/compat/include/linux/kernel.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/kobject.h b/datapath/linux/compat/include/linux/kobject.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/kobject.h
rename to datapath/linux/compat/include/linux/kobject.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/lockdep.h b/datapath/linux/compat/include/linux/lockdep.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/lockdep.h
rename to datapath/linux/compat/include/linux/lockdep.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/log2.h b/datapath/linux/compat/include/linux/log2.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/log2.h
rename to datapath/linux/compat/include/linux/log2.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/mutex.h b/datapath/linux/compat/include/linux/mutex.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/mutex.h
rename to datapath/linux/compat/include/linux/mutex.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/netdevice.h
rename to datapath/linux/compat/include/linux/netdevice.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/netfilter_bridge.h b/datapath/linux/compat/include/linux/netfilter_bridge.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/netfilter_bridge.h
rename to datapath/linux/compat/include/linux/netfilter_bridge.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/netfilter_ipv4.h b/datapath/linux/compat/include/linux/netfilter_ipv4.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/netfilter_ipv4.h
rename to datapath/linux/compat/include/linux/netfilter_ipv4.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/netlink.h b/datapath/linux/compat/include/linux/netlink.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/netlink.h
rename to datapath/linux/compat/include/linux/netlink.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/rculist.h b/datapath/linux/compat/include/linux/rculist.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/rculist.h
rename to datapath/linux/compat/include/linux/rculist.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/rcupdate.h b/datapath/linux/compat/include/linux/rcupdate.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/rcupdate.h
rename to datapath/linux/compat/include/linux/rcupdate.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/rtnetlink.h b/datapath/linux/compat/include/linux/rtnetlink.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/rtnetlink.h
rename to datapath/linux/compat/include/linux/rtnetlink.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
rename to datapath/linux/compat/include/linux/skbuff.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/slab.h b/datapath/linux/compat/include/linux/slab.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/slab.h
rename to datapath/linux/compat/include/linux/slab.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/stddef.h b/datapath/linux/compat/include/linux/stddef.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/stddef.h
rename to datapath/linux/compat/include/linux/stddef.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/tcp.h b/datapath/linux/compat/include/linux/tcp.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/tcp.h
rename to datapath/linux/compat/include/linux/tcp.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/timer.h b/datapath/linux/compat/include/linux/timer.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/timer.h
rename to datapath/linux/compat/include/linux/timer.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/types.h b/datapath/linux/compat/include/linux/types.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/types.h
rename to datapath/linux/compat/include/linux/types.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/udp.h b/datapath/linux/compat/include/linux/udp.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/udp.h
rename to datapath/linux/compat/include/linux/udp.h
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/workqueue.h b/datapath/linux/compat/include/linux/workqueue.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/linux/workqueue.h
rename to datapath/linux/compat/include/linux/workqueue.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/checksum.h b/datapath/linux/compat/include/net/checksum.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/checksum.h
rename to datapath/linux/compat/include/net/checksum.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/dst.h b/datapath/linux/compat/include/net/dst.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/dst.h
rename to datapath/linux/compat/include/net/dst.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/genetlink.h b/datapath/linux/compat/include/net/genetlink.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/genetlink.h
rename to datapath/linux/compat/include/net/genetlink.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/ip.h b/datapath/linux/compat/include/net/ip.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/ip.h
rename to datapath/linux/compat/include/net/ip.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/net_namespace.h b/datapath/linux/compat/include/net/net_namespace.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/net_namespace.h
rename to datapath/linux/compat/include/net/net_namespace.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/netlink.h b/datapath/linux/compat/include/net/netlink.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/netlink.h
rename to datapath/linux/compat/include/net/netlink.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/protocol.h b/datapath/linux/compat/include/net/protocol.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/protocol.h
rename to datapath/linux/compat/include/net/protocol.h
diff --git a/datapath/linux-2.6/compat-2.6/include/net/route.h b/datapath/linux/compat/include/net/route.h
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/include/net/route.h
rename to datapath/linux/compat/include/net/route.h
diff --git a/datapath/linux-2.6/compat-2.6/ip_output-openvswitch.c b/datapath/linux/compat/ip_output-openvswitch.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/ip_output-openvswitch.c
rename to datapath/linux/compat/ip_output-openvswitch.c
diff --git a/datapath/linux-2.6/compat-2.6/kmemdup.c b/datapath/linux/compat/kmemdup.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/kmemdup.c
rename to datapath/linux/compat/kmemdup.c
diff --git a/datapath/linux-2.6/compat-2.6/netdevice.c b/datapath/linux/compat/netdevice.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/netdevice.c
rename to datapath/linux/compat/netdevice.c
diff --git a/datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c b/datapath/linux/compat/skbuff-openvswitch.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c
rename to datapath/linux/compat/skbuff-openvswitch.c
diff --git a/datapath/linux-2.6/compat-2.6/time.c b/datapath/linux/compat/time.c
similarity index 100%
rename from datapath/linux-2.6/compat-2.6/time.c
rename to datapath/linux/compat/time.c
-- 
1.7.4.1




More information about the dev mailing list