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 1843d75690c32d20c6e5a94a88aa3f3829a94418..1415833fdda4a756b32e9194f637a1751324a76c 100644
(file)
--- a/
datapath/dp_notify.c
+++ b/
datapath/dp_notify.c
@@
-19,7
+19,6
@@
static int dp_device_event(struct notifier_block *unused, unsigned long event,
{
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))
struct datapath *dp;
if (is_internal_dev(dev))
@@
-30,24
+29,22
@@
static int dp_device_event(struct notifier_block *unused, unsigned long event,
if (!vport)
return NOTIFY_DONE;
if (!vport)
return NOTIFY_DONE;
- p = vport_get_dp_port(vport);
-
- if (!p)
- 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);
- 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;
mutex_unlock(&dp->mutex);
}
break;