diff --git a/[refs] b/[refs] index c785c6239910..b949d01b84e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 573dd788ccd919f90c78f971c0da124ffa4b8bff +refs/heads/master: b4076d1715b8a38138db0805a85932b3b650d583 diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c index 6d37b7e2a767..a1f16303703a 100644 --- a/trunk/net/8021q/vlan.c +++ b/trunk/net/8021q/vlan.c @@ -225,12 +225,6 @@ int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id) return -EOPNOTSUPP; } - /* The real device must be up and operating in order to - * assosciate a VLAN device with it. - */ - if (!(real_dev->flags & IFF_UP)) - return -ENETDOWN; - if (__find_vlan_dev(real_dev, vlan_id) != NULL) return -EEXIST;