---

yaml --- r: 4638 b: refs/heads/master c: f4637b5 h: refs/heads/master v: v3
git-mirror · Jul 12, 2005 · f0116f3 · f0116f3
1 parent 7e85665
commit f0116f3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab611487d8ada506e511d2b8f22fb8e7be9939b9
+refs/heads/master: f4637b55ba960d9987a836617271659e9b7b0de8
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
@@ -578,6 +578,14 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
 			if (!vlandev)
 				continue;
 
+			if (netif_carrier_ok(dev)) {
+				if (!netif_carrier_ok(vlandev))
+					netif_carrier_on(vlandev);
+			} else {
+				if (netif_carrier_ok(vlandev))
+					netif_carrier_off(vlandev);
+			}
+
 			if ((vlandev->state & VLAN_LINK_STATE_MASK) != flgs) {
 				vlandev->state = (vlandev->state &~ VLAN_LINK_STATE_MASK) 
 					| flgs;