Skip to content

L
linux-davinci
Commit 5065cc02 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

parents 8f5bb043 fa04ae5c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
net/core/ethtool.c
View file @ 5065cc02
...@@ -356,7 +356,7 @@ static int ethtool_set_coalesce(struct net_device *dev, void __user *useraddr) ...@@ -356,7 +356,7 @@ static int ethtool_set_coalesce(struct net_device *dev, void __user *useraddr)
{ {
struct ethtool_coalesce coalesce; struct ethtool_coalesce coalesce;
if (!dev->ethtool_ops->get_coalesce) if (!dev->ethtool_ops->set_coalesce)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (copy_from_user(&coalesce, useraddr, sizeof(coalesce))) if (copy_from_user(&coalesce, useraddr, sizeof(coalesce)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment