diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 16:58:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 16:58:53 -0700 |
| commit | 5065cc02ccf9212d31ecb7fcd63d734e242e64b1 (patch) | |
| tree | 7bd0b973ecc31a932a30ca9ab40797e4190d28da | |
| parent | [PATCH] binfmt_flat mmap flag fix (diff) | |
| parent | [ETHTOOL]: Check correct pointer in ethtool_set_coalesce(). (diff) | |
| download | linux-5065cc02ccf9212d31ecb7fcd63d734e242e64b1.tar.gz linux-5065cc02ccf9212d31ecb7fcd63d734e242e64b1.zip | |
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) { 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))) |