projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vlan: allow to change type when no vlan device is hooked on netdev
[cascardo/linux.git]
/
net
/
8021q
/
vlan.c
diff --git
a/net/8021q/vlan.c
b/net/8021q/vlan.c
index
9096bcb
..
ee07072
100644
(file)
--- a/
net/8021q/vlan.c
+++ b/
net/8021q/vlan.c
@@
-463,7
+463,9
@@
static int vlan_device_event(struct notifier_block *unused, unsigned long event,
case NETDEV_PRE_TYPE_CHANGE:
/* Forbid underlaying device to change its type. */
- return NOTIFY_BAD;
+ if (vlan_uses_dev(dev))
+ return NOTIFY_BAD;
+ break;
case NETDEV_NOTIFY_PEERS:
case NETDEV_BONDING_FAILOVER: