From 0d8ca5288e1d5c96def9f5ae9f2f916f2563f5b9 Mon Sep 17 00:00:00 2001
From: Stefan Rompf <stefan@loplof.de>
Date: Mon, 24 Jul 2006 13:52:13 -0700
Subject: [PATCH] --- yaml --- r: 32818 b: refs/heads/master c:
 6c753c3d3be0f8d1b570ec5720ad1bb4caf8232b h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/8021q/vlan.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 5f819598c4d5..ae51ef65bdb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a922ba5510530ae8e3c60edc85c56f72347a3c86
+refs/heads/master: 6c753c3d3be0f8d1b570ec5720ad1bb4caf8232b
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index 0ade0c63fdf6..18fcb9fa518d 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -67,10 +67,6 @@ static struct packet_type vlan_packet_type = {
 	.func = vlan_skb_recv, /* VLAN receive method */
 };
 
-/* Bits of netdev state that are propagated from real device to virtual */
-#define VLAN_LINK_STATE_MASK \
-	((1<<__LINK_STATE_PRESENT)|(1<<__LINK_STATE_NOCARRIER)|(1<<__LINK_STATE_DORMANT))
-
 /* End of global variables definitions. */
 
 /*
@@ -479,7 +475,9 @@ static struct net_device *register_vlan_device(const char *eth_IF_name,
 	new_dev->flags = real_dev->flags;
 	new_dev->flags &= ~IFF_UP;
 
-	new_dev->state = real_dev->state & ~(1<<__LINK_STATE_START);
+	new_dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
+					     (1<<__LINK_STATE_DORMANT))) |
+			 (1<<__LINK_STATE_PRESENT); 
 
 	/* need 4 bytes for extra VLAN header info,
 	 * hope the underlying device can handle it.