Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

5065cc02 · Linus Torvalds · 8f5bb043 · fa04ae5c · 5065cc02
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

net/core/ethtool.c net/core/ethtool.c +1 -1

未找到文件。
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -356,7 +356,7 @@ static int ethtool_set_coalesce(struct net_device *dev, void __user *useraddr)
 {
 	struct ethtool_coalesce coalesce;

-	if (!dev->ethtool_ops->get_coalesce)
+	if (!dev->ethtool_ops->set_coalesce)
 		return -EOPNOTSUPP;

 	if (copy_from_user(&coalesce, useraddr, sizeof(coalesce)))