---

yaml --- r: 111657 b: refs/heads/master c: 1ae4be2 h: refs/heads/master i: 111655: 900a444 v: v3
git-mirror · Sep 12, 2008 · 33d700b · 33d700b
1 parent d9d79dc
commit 33d700b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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;