From 7032539836ccc08362588fb75137530008891afc Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 23 Nov 2009 14:18:53 -0800
Subject: [PATCH] --- yaml --- r: 168962 b: refs/heads/master c:
 8c2acc53fd7987493f11640e266cf7130591e764 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/macvlan.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 312914e92208..f6998e4a93b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5b5150977cdfb7173f4468ccd30f9b4a981b902
+refs/heads/master: 8c2acc53fd7987493f11640e266cf7130591e764
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
index 3aabfd9dd212..2490aa39804c 100644
--- a/trunk/drivers/net/macvlan.c
+++ b/trunk/drivers/net/macvlan.c
@@ -360,6 +360,7 @@ static int macvlan_init(struct net_device *dev)
 	dev->state		= (dev->state & ~MACVLAN_STATE_MASK) |
 				  (lowerdev->state & MACVLAN_STATE_MASK);
 	dev->features 		= lowerdev->features & MACVLAN_FEATURES;
+	dev->gso_max_size	= lowerdev->gso_max_size;
 	dev->iflink		= lowerdev->ifindex;
 	dev->hard_header_len	= lowerdev->hard_header_len;
 
@@ -596,6 +597,7 @@ static int macvlan_device_event(struct notifier_block *unused,
 	case NETDEV_FEAT_CHANGE:
 		list_for_each_entry(vlan, &port->vlans, list) {
 			vlan->dev->features = dev->features & MACVLAN_FEATURES;
+			vlan->dev->gso_max_size = dev->gso_max_size;
 			netdev_features_change(vlan->dev);
 		}
 		break;