From 33d700ba81c4f73d1b23331226340fbfef7f86ed Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Thu, 11 Sep 2008 20:17:05 -0700
Subject: [PATCH] --- yaml --- r: 111657 b: refs/heads/master c:
 1ae4be22f64326a6784acd7083b9590c9f4215a2 h: refs/heads/master i:   111655:
 900a4441cff2603d9b79c0bac41bad18f22d583b v: v3

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

diff --git a/[refs] b/[refs]
index 82b5c6764e86..fc85a22395ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f07553a58c65741d6d125621123ecf9093fa0e3
+refs/heads/master: 1ae4be22f64326a6784acd7083b9590c9f4215a2
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index b661f47bf10a..f0e335aa20df 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -394,6 +394,7 @@ static void vlan_transfer_features(struct net_device *dev,
 
 	vlandev->features &= ~dev->vlan_features;
 	vlandev->features |= dev->features & dev->vlan_features;
+	vlandev->gso_max_size = dev->gso_max_size;
 
 	if (old_features != vlandev->features)
 		netdev_features_change(vlandev);
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
index 4bf014e51f8c..97688cdb5501 100644
--- a/trunk/net/8021q/vlan_dev.c
+++ b/trunk/net/8021q/vlan_dev.c
@@ -607,6 +607,7 @@ static int vlan_dev_init(struct net_device *dev)
 		      (1<<__LINK_STATE_PRESENT);
 
 	dev->features |= real_dev->features & real_dev->vlan_features;
+	dev->gso_max_size = real_dev->gso_max_size;
 
 	/* ipv6 shared card related stuff */
 	dev->dev_id = real_dev->dev_id;