diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 19:58:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 19:58:53 -0400 |
| commit | 5065cc02ccf9212d31ecb7fcd63d734e242e64b1 (patch) | |
| tree | 7bd0b973ecc31a932a30ca9ab40797e4190d28da | |
| parent | 8f5bb0438b86d1a5393176ceeec2836fd469edf8 (diff) | |
| parent | fa04ae5c09f3dfedbc923c2954a9a26a573833f1 (diff) | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
| -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))) |