diff options
| author | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2015-07-21 04:14:53 +0000 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@cvs.openbsd.org> | 2015-07-21 04:14:53 +0000 |
| commit | 80bbd7cca3bbc9a3a58a3a319539c8ec5aa13b59 (patch) | |
| tree | 056dd5ca8911dea649967ac139d4370b46c2687d /sys | |
| parent | 65ef03fc5a932083476ee6b527434b9ac86e188e (diff) | |
Fix ioctl number conflict and sort ioctl numbers.
ok mpi@.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/sys/sockio.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h index 11ef87427f3..9afc8bb0306 100644 --- a/sys/sys/sockio.h +++ b/sys/sys/sockio.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sockio.h,v 1.58 2015/07/20 22:16:41 rzalamena Exp $ */ +/* $OpenBSD: sockio.h,v 1.59 2015/07/21 04:14:52 rzalamena Exp $ */ /* $NetBSD: sockio.h,v 1.5 1995/08/23 00:40:47 thorpej Exp $ */ /*- @@ -186,8 +186,12 @@ #define SIOCSLIFPHYTTL _IOW('i', 168, struct ifreq) /* set tunnel ttl */ #define SIOCGLIFPHYTTL _IOWR('i', 169, struct ifreq) /* get tunnel ttl */ -#define SIOCSETMPWCFG _IOW('i', 170, struct ifreq) /* set mpw config */ -#define SIOCGETMPWCFG _IOWR('i', 171, struct ifreq) /* get mpw config */ +#define SIOCGIFRXR _IOW('i', 170, struct ifreq) +#define SIOCIFAFATTACH _IOW('i', 171, struct if_afreq) /* attach given af */ +#define SIOCIFAFDETACH _IOW('i', 172, struct if_afreq) /* detach given af */ + +#define SIOCSETMPWCFG _IOW('i', 173, struct ifreq) /* set mpw config */ +#define SIOCGETMPWCFG _IOWR('i', 174, struct ifreq) /* get mpw config */ #define SIOCSVH _IOWR('i', 245, struct ifreq) /* set carp param */ #define SIOCGVH _IOWR('i', 246, struct ifreq) /* get carp param */ @@ -198,8 +202,4 @@ #define SIOCSETPFLOW _IOW('i', 253, struct ifreq) #define SIOCGETPFLOW _IOWR('i', 254, struct ifreq) -#define SIOCGIFRXR _IOW('i', 170, struct ifreq) -#define SIOCIFAFATTACH _IOW('i', 171, struct if_afreq) /* attach given af */ -#define SIOCIFAFDETACH _IOW('i', 172, struct if_afreq) /* detach given af */ - #endif /* !_SYS_SOCKIO_H_ */ |