---

yaml --- r: 251652 b: refs/heads/master c: f11970e h: refs/heads/master v: v3
git-mirror · May 25, 2011 · bf3f35e · bf3f35e
1 parent e40cdf0
commit bf3f35e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6dcbbe25dcc9bd2bdeb4f685f8fb874ffc10e6be
+refs/heads/master: f11970e383acd6f505f492f1bc07fb1a4d884829
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -1308,6 +1308,13 @@ void dev_disable_lro(struct net_device *dev)
 {
 	u32 flags;
 
+	/*
+	 * If we're trying to disable lro on a vlan device
+	 * use the underlying physical device instead
+	 */
+	if (is_vlan_dev(dev))
+		dev = vlan_dev_real_dev(dev);
+
 	if (dev->ethtool_ops && dev->ethtool_ops->get_flags)
 		flags = dev->ethtool_ops->get_flags(dev);
 	else