Skip to content

Commit

Permalink
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Linus Torvalds committed Jun 6, 2005
2 parents 8f5bb04 + fa04ae5 commit 5065cc0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/core/ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down

0 comments on commit 5065cc0

Please sign in to comment.