diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-07-30 16:16:45 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-30 16:16:45 -0400 |
commit | b4076d1715b8a38138db0805a85932b3b650d583 (patch) | |
tree | 3b7ab6f84953f16a8ea8bed8aa40617e71308fad /net/8021q | |
parent | 573dd788ccd919f90c78f971c0da124ffa4b8bff (diff) |
vlan: allow creating vlan when real device is not up
There is no reason for the arbitrary restriction that device must be
up to create a vlan. This patch was added to Vyatta kernel to resolve startup
ordering issues where vlan's are created but real device was disabled.
Note: the vlan already correctly inherits the operstate from real device; so
if vlan is created and real device is marked down, the vlan is marked
down.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlan.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 6d37b7e2a767..a1f16303703a 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -225,12 +225,6 @@ int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id) | |||
225 | return -EOPNOTSUPP; | 225 | return -EOPNOTSUPP; |
226 | } | 226 | } |
227 | 227 | ||
228 | /* The real device must be up and operating in order to | ||
229 | * assosciate a VLAN device with it. | ||
230 | */ | ||
231 | if (!(real_dev->flags & IFF_UP)) | ||
232 | return -ENETDOWN; | ||
233 | |||
234 | if (__find_vlan_dev(real_dev, vlan_id) != NULL) | 228 | if (__find_vlan_dev(real_dev, vlan_id) != NULL) |
235 | return -EEXIST; | 229 | return -EEXIST; |
236 | 230 | ||