diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-13 22:25:38 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-13 22:25:38 +0100 |
| commit | 89ab216b33ba9405880fd3d89531305a931bc70f (patch) | |
| tree | 8f6428ce51ecaed6f6e1379c036dbe341eb71e34 /net/8021q/vlan.c | |
| parent | Merge tag 'omap-cleanup-b2-for-3.8' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-89ab216b33ba9405880fd3d89531305a931bc70f.tar.xz linux-89ab216b33ba9405880fd3d89531305a931bc70f.zip | |
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
Diffstat (limited to 'net/8021q/vlan.c')
| -rw-r--r-- | net/8021q/vlan.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 9096bcb08132..ee070722a3a3 100644 --- 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: |