Merge branch 'next.autofs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / net / core / dev_ioctl.c

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 31380fd5a4e2ace4736384c3f182381768e3e0d5..5163d900bb4fb1057e273ed667e9457f05b33c93 100644 (file)
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -366,7 +366,8 @@ EXPORT_SYMBOL(dev_load);
  *     dev_ioctl       -       network device ioctl
  *     @net: the applicable net namespace
  *     @cmd: command to issue
- *     @arg: pointer to a struct ifreq in user space
+ *     @ifr: pointer to a struct ifreq in user space
+ *     @need_copyout: whether or not copy_to_user() should be called
  *
  *     Issue ioctl functions to devices. This is normally called by the
  *     user space syscall interfaces but can sometimes be useful for