---

yaml --- r: 214565 b: refs/heads/master c: 67c9660 h: refs/heads/master i: 214563: 271d4dc v: v3
git-mirror · Sep 17, 2010 · 9b391d3 · 9b391d3
1 parent 1838c70
commit 9b391d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 457e9d2233bdde5bb5577df3e2d4d48f84c67b66
+refs/heads/master: 67c9660831f6b6b76866a0838466c83765ffbbd3
diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c
@@ -1181,8 +1181,11 @@ static int ethtool_set_gro(struct net_device *dev, char __user *useraddr)
 		return -EFAULT;
 
 	if (edata.data) {
-		if (!dev->ethtool_ops->get_rx_csum ||
-		    !dev->ethtool_ops->get_rx_csum(dev))
+		u32 rxcsum = dev->ethtool_ops->get_rx_csum ?
+				dev->ethtool_ops->get_rx_csum(dev) :
+				ethtool_op_get_rx_csum(dev);
+
+		if (!rxcsum)
 			return -EINVAL;
 		dev->features |= NETIF_F_GRO;
 	} else