meta-flow: Correctly set destination MAC in mf_set_flow_value().

[sliver-openvswitch.git] / datapath / brcompat.c

diff --git a/datapath/brcompat.c b/datapath/brcompat.c
index 718e489..339b5dc 100644 (file)
--- a/datapath/brcompat.c
+++ b/datapath/brcompat.c
@@ -1,13 +1,24 @@
 /*
- * Copyright (c) 2009, 2011 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * Copyright (c) 2007-2012 Nicira Networks.
  *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/uaccess.h>
 #include <linux/completion.h>
@@ -506,7 +517,7 @@ static int __init brc_init(void)
        brioctl_set(brc_ioctl_deviceless_stub);
 
        /* Set the openvswitch_mod device ioctl handler */
-       dp_ioctl_hook = brc_dev_ioctl;
+       ovs_dp_ioctl_hook = brc_dev_ioctl;
 
        /* Randomize the initial sequence number.  This is not a security
         * feature; it only helps avoid crossed wires between userspace and
@@ -537,7 +548,7 @@ error:
 static void brc_cleanup(void)
 {
        /* Unregister ioctl hooks */
-       dp_ioctl_hook = NULL;
+       ovs_dp_ioctl_hook = NULL;
        brioctl_set(NULL);
 
        genl_unregister_family(&brc_genl_family);
@@ -549,3 +560,12 @@ module_exit(brc_cleanup);
 MODULE_DESCRIPTION("Open vSwitch bridge compatibility");
 MODULE_AUTHOR("Nicira Networks");
 MODULE_LICENSE("GPL");
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
+/*
+ * In kernels 2.6.36 and later, Open vSwitch can safely coexist with
+ * the Linux bridge module, but it does not make sense to load both bridge and
+ * brcompat_mod, so this prevents it.
+ */
+BRIDGE_MUTUAL_EXCLUSION;
+#endif