datapath: Better handle vlan packets sent to userspace.

[openvswitch] / datapath / dp_notify.c

diff --git a/datapath/dp_notify.c b/datapath/dp_notify.c
index 8c54d68315a8d43696cff4c2dbea9c7de1dfe3bb..122b2fa989a9838f9d3940a6afae64c8a96c77c1 100644 (file)
--- a/datapath/dp_notify.c
+++ b/datapath/dp_notify.c
@@ -1,14 +1,23 @@
 /*
- * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2007-2011 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
  */
 
-/* Handle changes to managed devices */
-
 #include <linux/netdevice.h>
+#include <net/genetlink.h>
 
 #include "datapath.h"
 #include "vport-internal_dev.h"
@@ -33,21 +42,31 @@ static int dp_device_event(struct notifier_block *unused, unsigned long event,
 
        switch (event) {
        case NETDEV_UNREGISTER:
-               if (!is_internal_dev(dev))
+               if (!is_internal_dev(dev)) {
+                       struct sk_buff *reply;
+
+                       reply = ovs_vport_cmd_build_info(vport, 0, 0,
+                                                        OVS_VPORT_CMD_DEL);
                        dp_detach_port(vport);
+                       if (IS_ERR(reply)) {
+                               netlink_set_err(INIT_NET_GENL_SOCK, 0,
+                                               dp_vport_multicast_group.id,
+                                               PTR_ERR(reply));
+                               break;
+                       }
+
+                       genl_notify(reply, dev_net(dev), 0,
+                                   dp_vport_multicast_group.id, NULL,
+                                   GFP_KERNEL);
+               }
                break;
 
        case NETDEV_CHANGENAME:
-               if (vport->port_no != ODPP_LOCAL) {
+               if (vport->port_no != OVSP_LOCAL) {
                        dp_sysfs_del_if(vport);
                        dp_sysfs_add_if(vport);
                }
                break;
-
-       case NETDEV_CHANGEMTU:
-               if (!is_internal_dev(dev))
-                       set_internal_devs_mtu(dp);
-               break;
        }
        return NOTIFY_DONE;
 }