diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-07 14:29:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-07 14:29:43 -0400 |
| commit | 2bfe94905d3601774c6418c020ba830c118578b4 (patch) | |
| tree | 49f908df283332371b74c4686dd2f0109db2bc61 /net | |
| parent | 26abd53d8e9e51bbeea0b4772e8dffece3eeff38 (diff) | |
| parent | 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/ethtool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 8ec484894d68..a3eeb88e1c81 100644 --- 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) | |||
| 356 | { | 356 | { |
| 357 | struct ethtool_coalesce coalesce; | 357 | struct ethtool_coalesce coalesce; |
| 358 | 358 | ||
| 359 | if (!dev->ethtool_ops->get_coalesce) | 359 | if (!dev->ethtool_ops->set_coalesce) |
| 360 | return -EOPNOTSUPP; | 360 | return -EOPNOTSUPP; |
| 361 | 361 | ||
| 362 | if (copy_from_user(&coalesce, useraddr, sizeof(coalesce))) | 362 | if (copy_from_user(&coalesce, useraddr, sizeof(coalesce))) |