Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
5065cc02cc
1 changed files with 1 additions and 1 deletions
|
@ -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)))
|
||||||
|
|
Loading…
Reference in a new issue