projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
odp-util: Improve formatting of bogus empty action attributes.
[openvswitch]
/
datapath
/
dp_notify.c
diff --git
a/datapath/dp_notify.c
b/datapath/dp_notify.c
index 4a16a93fdc5356d24620b94690b8476a16b03774..1415833fdda4a756b32e9194f637a1751324a76c 100644
(file)
--- a/
datapath/dp_notify.c
+++ b/
datapath/dp_notify.c
@@
-14,51
+14,44
@@
#include "vport-internal_dev.h"
#include "vport-netdev.h"
#include "vport-internal_dev.h"
#include "vport-netdev.h"
-static int dp_device_event(struct notifier_block *unused, unsigned long event,
- void *ptr)
+static int dp_device_event(struct notifier_block *unused, unsigned long event,
+ void *ptr)
{
struct net_device *dev = ptr;
struct vport *vport;
{
struct net_device *dev = ptr;
struct vport *vport;
- struct dp_port *p;
struct datapath *dp;
if (is_internal_dev(dev))
vport = internal_dev_get_vport(dev);
struct datapath *dp;
if (is_internal_dev(dev))
vport = internal_dev_get_vport(dev);
- else
{
+ else
vport = netdev_get_vport(dev);
vport = netdev_get_vport(dev);
- if (!vport)
- return NOTIFY_DONE;
- }
-
- p = vport_get_dp_port(vport);
-
- if (!p)
+ if (!vport)
return NOTIFY_DONE;
return NOTIFY_DONE;
- dp = p->dp;
+
+ dp = vport->dp;
switch (event) {
case NETDEV_UNREGISTER:
switch (event) {
case NETDEV_UNREGISTER:
- mutex_lock(&dp->mutex);
- dp_detach_port(p, 1);
- mutex_unlock(&dp->mutex);
+ if (!is_internal_dev(dev)) {
+ mutex_lock(&dp->mutex);
+ dp_detach_port(vport);
+ mutex_unlock(&dp->mutex);
+ }
break;
case NETDEV_CHANGENAME:
break;
case NETDEV_CHANGENAME:
- if (
p
->port_no != ODPP_LOCAL) {
+ if (
vport
->port_no != ODPP_LOCAL) {
mutex_lock(&dp->mutex);
mutex_lock(&dp->mutex);
- dp_sysfs_del_if(
p
);
- dp_sysfs_add_if(
p
);
+ dp_sysfs_del_if(
vport
);
+ dp_sysfs_add_if(
vport
);
mutex_unlock(&dp->mutex);
}
break;
case NETDEV_CHANGEMTU:
mutex_unlock(&dp->mutex);
}
break;
case NETDEV_CHANGEMTU:
- if (!is_internal_dev(dev)) {
- mutex_lock(&dp->mutex);
+ if (!is_internal_dev(dev))
set_internal_devs_mtu(dp);
set_internal_devs_mtu(dp);
- mutex_unlock(&dp->mutex);
- }
break;
}
return NOTIFY_DONE;
break;
}
return NOTIFY_DONE;