diff options
Diffstat (limited to 'fs/compat_ioctl.c')
-rw-r--r-- | fs/compat_ioctl.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index 45e59d3c7f1f..3e87ce443ea2 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/if.h> | 23 | #include <linux/if.h> |
24 | #include <linux/if_bridge.h> | 24 | #include <linux/if_bridge.h> |
25 | #include <linux/slab.h> | 25 | #include <linux/slab.h> |
26 | #include <linux/raid/md.h> | 26 | #include <linux/raid/md_u.h> |
27 | #include <linux/kd.h> | 27 | #include <linux/kd.h> |
28 | #include <linux/route.h> | 28 | #include <linux/route.h> |
29 | #include <linux/in6.h> | 29 | #include <linux/in6.h> |
@@ -522,6 +522,11 @@ static int dev_ifsioc(unsigned int fd, unsigned int cmd, unsigned long arg) | |||
522 | if (err) | 522 | if (err) |
523 | return -EFAULT; | 523 | return -EFAULT; |
524 | break; | 524 | break; |
525 | case SIOCSHWTSTAMP: | ||
526 | if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) | ||
527 | return -EFAULT; | ||
528 | ifr.ifr_data = compat_ptr(uifr32->ifr_ifru.ifru_data); | ||
529 | break; | ||
525 | default: | 530 | default: |
526 | if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) | 531 | if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) |
527 | return -EFAULT; | 532 | return -EFAULT; |
@@ -1993,6 +1998,8 @@ COMPATIBLE_IOCTL(TUNSETGROUP) | |||
1993 | COMPATIBLE_IOCTL(TUNGETFEATURES) | 1998 | COMPATIBLE_IOCTL(TUNGETFEATURES) |
1994 | COMPATIBLE_IOCTL(TUNSETOFFLOAD) | 1999 | COMPATIBLE_IOCTL(TUNSETOFFLOAD) |
1995 | COMPATIBLE_IOCTL(TUNSETTXFILTER) | 2000 | COMPATIBLE_IOCTL(TUNSETTXFILTER) |
2001 | COMPATIBLE_IOCTL(TUNGETSNDBUF) | ||
2002 | COMPATIBLE_IOCTL(TUNSETSNDBUF) | ||
1996 | /* Big V */ | 2003 | /* Big V */ |
1997 | COMPATIBLE_IOCTL(VT_SETMODE) | 2004 | COMPATIBLE_IOCTL(VT_SETMODE) |
1998 | COMPATIBLE_IOCTL(VT_GETMODE) | 2005 | COMPATIBLE_IOCTL(VT_GETMODE) |
@@ -2566,6 +2573,7 @@ HANDLE_IOCTL(SIOCSIFMAP, dev_ifsioc) | |||
2566 | HANDLE_IOCTL(SIOCGIFADDR, dev_ifsioc) | 2573 | HANDLE_IOCTL(SIOCGIFADDR, dev_ifsioc) |
2567 | HANDLE_IOCTL(SIOCSIFADDR, dev_ifsioc) | 2574 | HANDLE_IOCTL(SIOCSIFADDR, dev_ifsioc) |
2568 | HANDLE_IOCTL(SIOCSIFHWBROADCAST, dev_ifsioc) | 2575 | HANDLE_IOCTL(SIOCSIFHWBROADCAST, dev_ifsioc) |
2576 | HANDLE_IOCTL(SIOCSHWTSTAMP, dev_ifsioc) | ||
2569 | 2577 | ||
2570 | /* ioctls used by appletalk ddp.c */ | 2578 | /* ioctls used by appletalk ddp.c */ |
2571 | HANDLE_IOCTL(SIOCATALKDIFADDR, dev_ifsioc) | 2579 | HANDLE_IOCTL(SIOCATALKDIFADDR, dev_ifsioc) |