Commit d24fff22d8dba13cc21034144f68f213415cb7c8
Committed by
David S. Miller
David S. Miller
1 parent
51f31cabe3
Exists in
master
and in
4 other branches
net: pass new SIOCSHWTSTAMP through to device drivers
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 2 changed files with 8 additions and 0 deletions Side-by-side Diff
fs/compat_ioctl.c
| ... | ... | @@ -522,6 +522,11 @@ |
| 522 | 522 | if (err) |
| 523 | 523 | return -EFAULT; |
| 524 | 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 | 530 | default: |
| 526 | 531 | if (copy_from_user(&ifr, uifr32, sizeof(*uifr32))) |
| 527 | 532 | return -EFAULT; |
| ... | ... | @@ -2563,6 +2568,7 @@ |
| 2563 | 2568 | HANDLE_IOCTL(SIOCGIFADDR, dev_ifsioc) |
| 2564 | 2569 | HANDLE_IOCTL(SIOCSIFADDR, dev_ifsioc) |
| 2565 | 2570 | HANDLE_IOCTL(SIOCSIFHWBROADCAST, dev_ifsioc) |
| 2571 | +HANDLE_IOCTL(SIOCSHWTSTAMP, dev_ifsioc) | |
| 2566 | 2572 | |
| 2567 | 2573 | /* ioctls used by appletalk ddp.c */ |
| 2568 | 2574 | HANDLE_IOCTL(SIOCATALKDIFADDR, dev_ifsioc) |
net/core/dev.c
| ... | ... | @@ -4019,6 +4019,7 @@ |
| 4019 | 4019 | cmd == SIOCSMIIREG || |
| 4020 | 4020 | cmd == SIOCBRADDIF || |
| 4021 | 4021 | cmd == SIOCBRDELIF || |
| 4022 | + cmd == SIOCSHWTSTAMP || | |
| 4022 | 4023 | cmd == SIOCWANDEV) { |
| 4023 | 4024 | err = -EOPNOTSUPP; |
| 4024 | 4025 | if (ops->ndo_do_ioctl) { |
| ... | ... | @@ -4173,6 +4174,7 @@ |
| 4173 | 4174 | case SIOCBONDCHANGEACTIVE: |
| 4174 | 4175 | case SIOCBRADDIF: |
| 4175 | 4176 | case SIOCBRDELIF: |
| 4177 | + case SIOCSHWTSTAMP: | |
| 4176 | 4178 | if (!capable(CAP_NET_ADMIN)) |
| 4177 | 4179 | return -EPERM; |
| 4178 | 4180 | /* fall through */ |