Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (5065cc02) · Commits · e / devices / android_kernel_xiaomi_markw

net/core/ethtool.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)))