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>

73 files changed, 88 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 735ff0e94..eaf4d85f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,8 @@ post v1.1.0
       --with-l26-source has been renamed --with-linux-source.  The old
       names will be removed after the next release, so please update
       your scripts.
+    - The "-2.6" suffix has been dropped from the datapath/linux-2.6 and
+      datapath/linux-2.6/compat-2.6 directories.
     - Feature removals:
       - Dropped support for "tun_id_from_cookie" OpenFlow extension.
 	(Use the extensible match extensions instead.)
diff --git a/INSTALL.Linux b/INSTALL.Linux
index 318c9a752..c7e4ed97d 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 8e65021b6..650e776ef 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 fc7155f7b..1618a439c 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 0cf6863ec..046b38698 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 5c5bc2173..e1bd3e69a 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 3fb9e9ba9..000000000
--- 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
index e2a0cb7a2..b99cbd344 100644
--- a/datapath/linux-2.6/.gitignore
+++ b/datapath/linux/.gitignore
@@ -20,7 +20,6 @@
 /ip_output-openvswitch.c
 /kcompat.h
 /kmemdup.c
-/linux-2.6
 /loop_counter.c
 /modules.order
 /netdevice.c
diff --git a/datapath/linux-2.6/Kbuild.in b/datapath/linux/Kbuild.in
index 2158382b0..4e1611a31 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
index efc1663e4..efc1663e4 100644
--- a/datapath/linux-2.6/Makefile.in
+++ b/datapath/linux/Makefile.in
diff --git a/datapath/linux-2.6/Makefile.main.in b/datapath/linux/Makefile.main.in
index 1edfc3412..1edfc3412 100644
--- a/datapath/linux-2.6/Makefile.main.in
+++ b/datapath/linux/Makefile.main.in
diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk
new file mode 100644
index 000000000..217f12d48
--- /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
index b5a757407..b5a757407 100644
--- a/datapath/linux-2.6/compat-2.6/addrconf_core-openvswitch.c
+++ b/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
index 5b7444bb3..5b7444bb3 100644
--- a/datapath/linux-2.6/compat-2.6/dev-openvswitch.c
+++ b/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
index 31108cda3..31108cda3 100644
--- a/datapath/linux-2.6/compat-2.6/genetlink-brcompat.c
+++ b/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
index 3e687b7ea..3e687b7ea 100644
--- a/datapath/linux-2.6/compat-2.6/genetlink-openvswitch.c
+++ b/datapath/linux/compat/genetlink-openvswitch.c
diff --git a/datapath/linux-2.6/compat-2.6/genetlink.inc b/datapath/linux/compat/genetlink.inc
index d381e4f0c..d381e4f0c 100644
--- a/datapath/linux-2.6/compat-2.6/genetlink.inc
+++ b/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
index 1d9b31401..1d9b31401 100644
--- a/datapath/linux-2.6/compat-2.6/include/asm-generic/bug.h
+++ b/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
index 59eb4bca6..59eb4bca6 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/bottom_half.h
+++ b/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
index 1ee8d6f74..1ee8d6f74 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/compiler-gcc.h
+++ b/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
index dbe3ca745..dbe3ca745 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/compiler.h
+++ b/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
index 48c73aa8f..48c73aa8f 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/cpumask.h
+++ b/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
index 01d4396fb..01d4396fb 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/dmi.h
+++ b/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
index 50faf2a11..50faf2a11 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/err.h
+++ b/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
index e45d08546..e45d08546 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/genetlink.h
+++ b/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
index 89b354e4c..89b354e4c 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/icmp.h
+++ b/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
index f005a48ee..f005a48ee 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/icmpv6.h
+++ b/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
index 43128b763..43128b763 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/if.h
+++ b/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
index e48d6ba0d..e48d6ba0d 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/if_arp.h
+++ b/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
index b8390e230..b8390e230 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/if_ether.h
+++ b/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
index f41840748..f41840748 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/if_vlan.h
+++ b/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
index f91a832a7..f91a832a7 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/in.h
+++ b/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
index 813a70ad0..813a70ad0 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/inetdevice.h
+++ b/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
index 6ff715240..6ff715240 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/ip.h
+++ b/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
index 25a5431af..25a5431af 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/ipv6.h
+++ b/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
index 3286e6346..3286e6346 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/jiffies.h
+++ b/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
index 4af88516e..4af88516e 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/kernel.h
+++ b/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
index 4cf797e36..4cf797e36 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/kobject.h
+++ b/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
index 1c839423a..1c839423a 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/lockdep.h
+++ b/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
index 69abae5e8..69abae5e8 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/log2.h
+++ b/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
index 020a28097..020a28097 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/mutex.h
+++ b/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
index 04ebd89a7..04ebd89a7 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/netdevice.h
+++ b/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
index c526537e1..c526537e1 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/netfilter_bridge.h
+++ b/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
index ed8a5d948..ed8a5d948 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/netfilter_ipv4.h
+++ b/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
index 16660977c..16660977c 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/netlink.h
+++ b/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
index 4164c0e99..4164c0e99 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/rculist.h
+++ b/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
index 99459ea71..99459ea71 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/rcupdate.h
+++ b/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
index 0a0214940..0a0214940 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/rtnetlink.h
+++ b/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
index b728c5179..b728c5179 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h
+++ b/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
index 7e9c3f4e2..7e9c3f4e2 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/slab.h
+++ b/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
index 9b68f710f..9b68f710f 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/stddef.h
+++ b/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
index 6fad1933b..6fad1933b 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/tcp.h
+++ b/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
index 6c3a9b0f5..6c3a9b0f5 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/timer.h
+++ b/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
index b989d96c3..b989d96c3 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/types.h
+++ b/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
index 6fe4721bf..6fe4721bf 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/udp.h
+++ b/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
index 01c6345e9..01c6345e9 100644
--- a/datapath/linux-2.6/compat-2.6/include/linux/workqueue.h
+++ b/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
index 73f2f5992..73f2f5992 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/checksum.h
+++ b/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
index f481a9d3f..f481a9d3f 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/dst.h
+++ b/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
index c91408eeb..c91408eeb 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/genetlink.h
+++ b/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
index b18b968b6..b18b968b6 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/ip.h
+++ b/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
index 9ce9fcd20..9ce9fcd20 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/net_namespace.h
+++ b/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
index 10558b077..10558b077 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/netlink.h
+++ b/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
index 6ffe0cb0b..6ffe0cb0b 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/protocol.h
+++ b/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
index 86e8e5bab..86e8e5bab 100644
--- a/datapath/linux-2.6/compat-2.6/include/net/route.h
+++ b/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
index a09fcbce4..a09fcbce4 100644
--- a/datapath/linux-2.6/compat-2.6/ip_output-openvswitch.c
+++ b/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
index b5188fdb8..b5188fdb8 100644
--- a/datapath/linux-2.6/compat-2.6/kmemdup.c
+++ b/datapath/linux/compat/kmemdup.c
diff --git a/datapath/linux-2.6/compat-2.6/netdevice.c b/datapath/linux/compat/netdevice.c
index 1a6f327ad..1a6f327ad 100644
--- a/datapath/linux-2.6/compat-2.6/netdevice.c
+++ b/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
index ef43ba900..ef43ba900 100644
--- a/datapath/linux-2.6/compat-2.6/skbuff-openvswitch.c
+++ b/datapath/linux/compat/skbuff-openvswitch.c
diff --git a/datapath/linux-2.6/compat-2.6/time.c b/datapath/linux/compat/time.c
index ad3ee9440..ad3ee9440 100644
--- a/datapath/linux-2.6/compat-2.6/time.c
+++ b/datapath/linux/compat/time.c
diff --git a/debian/rules.modules b/debian/rules.modules
index d84348dd2..eb779c456 100755
--- a/debian/rules.modules
+++ b/debian/rules.modules
@@ -27,9 +27,9 @@ binary-modules: prep-deb-files
 	dh_clean -k
 	tar xzf openvswitch.tar.gz
 	cd openvswitch && ./configure --with-linux=$(KSRC) $(DATAPATH_CONFIGURE_OPTS) --with-build-number=$(BUILD_NUMBER)
-	cd openvswitch && $(MAKE) -C datapath/linux-2.6
+	cd openvswitch && $(MAKE) -C datapath/linux
 	install -d -m755 $(DSTDIR)
-	install -m644 openvswitch/datapath/linux-2.6/*_mod.ko $(DSTDIR)/
+	install -m644 openvswitch/datapath/linux/*_mod.ko $(DSTDIR)/
 	dh_installmodules
 	dh_installdocs
 	dh_installchangelogs
diff --git a/rhel/openvswitch-kmod-rhel5.spec.in b/rhel/openvswitch-kmod-rhel5.spec.in
index cf2a077b2..0f4ef32d3 100644
--- a/rhel/openvswitch-kmod-rhel5.spec.in
+++ b/rhel/openvswitch-kmod-rhel5.spec.in
@@ -64,7 +64,7 @@ for kvariant in %{kvariants} ; do
     KSRC=%{_usrsrc}/kernels/%{kversion}${kvariant:+-$kvariant}-%{_target_cpu}
     cd _kmod_build_$kvariant
     ../openvswitch-%{version}/configure --with-linux="$KSRC"
-    %{__make} -C datapath/linux-2.6 %{?_smp_mflags}
+    %{__make} -C datapath/linux %{?_smp_mflags}
     cd ..
 done
 
@@ -74,7 +74,7 @@ export INSTALL_MOD_PATH=%{buildroot}
 export INSTALL_MOD_DIR=extra/%{kmod_name}
 for kvariant in %{kvariants} ; do
     KSRC=%{_usrsrc}/kernels/%{kversion}${kvariant:+-$kvariant}-%{_target_cpu}
-    %{__make} -C "${KSRC}" modules_install M=$PWD/_kmod_build_$kvariant/datapath/linux-2.6
+    %{__make} -C "${KSRC}" modules_install M=$PWD/_kmod_build_$kvariant/datapath/linux
 done
 %{__install} -d %{buildroot}%{_sysconfdir}/depmod.d/
 %{__install} kmod-%{kmod_name}.conf %{buildroot}%{_sysconfdir}/depmod.d/
diff --git a/rhel/openvswitch-kmod-rhel6.spec.in b/rhel/openvswitch-kmod-rhel6.spec.in
index 8f9b2efcb..1d1955d6d 100644
--- a/rhel/openvswitch-kmod-rhel6.spec.in
+++ b/rhel/openvswitch-kmod-rhel6.spec.in
@@ -41,7 +41,7 @@ Open vSwitch Linux kernel module.
 for flavor in %flavors_to_build; do
 	mkdir _$flavor
 	(cd _$flavor && ../configure --with-linux="%{kernel_source $flavor}")
-	%{__make} -C _$flavor/datapath/linux-2.6 %{?_smp_mflags}
+	%{__make} -C _$flavor/datapath/linux %{?_smp_mflags}
 done
 
 %install
@@ -49,7 +49,7 @@ export INSTALL_MOD_PATH=$RPM_BUILD_ROOT
 export INSTALL_MOD_DIR=extra/%{name}
 for flavor in %flavors_to_build ; do
          make -C %{kernel_source $flavor} modules_install \
-                 M=$PWD/_$flavor/datapath/linux-2.6
+                 M=$PWD/_$flavor/datapath/linux
 done
 
 %clean
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index f83a8d5a1..f9d7464b0 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -116,7 +116,7 @@ install -m 644 \
                $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py
 
 install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch
-find datapath/linux-2.6 -name *.ko -exec install -m 755  \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch \;
+find datapath/linux -name *.ko -exec install -m 755  \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch \;
 install xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
 
 # Get rid of stuff we don't want to make RPM happy.