From 4d7ed5baa992d5f08fb5ae45257e899e2a27e646 Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 20 Jul 2009 07:35:37 -0700
Subject: [PATCH] --- yaml --- r: 158989 b: refs/heads/master c:
 2e477c9bd2bb6a1606e498adb53ba913378ecdf2 h: refs/heads/master i:   158987:
 09b199c3141a1b943849ab9decff269c551db71a v: v3

---
 [refs]                 |  2 +-
 trunk/net/8021q/vlan.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 154e069e56f1..a291c624d085 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37cf2b8d1622897cf57e70cdab9eba57feb5ff6c
+refs/heads/master: 2e477c9bd2bb6a1606e498adb53ba913378ecdf2
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index fe649081fbdc..6d37b7e2a767 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -468,6 +468,19 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
 		}
 		break;
 
+	case NETDEV_CHANGEMTU:
+		for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
+			vlandev = vlan_group_get_device(grp, i);
+			if (!vlandev)
+				continue;
+
+			if (vlandev->mtu <= dev->mtu)
+				continue;
+
+			dev_set_mtu(vlandev, dev->mtu);
+		}
+		break;
+
 	case NETDEV_FEAT_CHANGE:
 		/* Propagate device features to underlying device */
 		for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {