Index: sys/net80211/ieee80211_ioctl.h
===================================================================
RCS file: /cvs/src/sys/net80211/ieee80211_ioctl.h,v
retrieving revision 1.29
diff -u -p -r1.29 ieee80211_ioctl.h
--- sys/net80211/ieee80211_ioctl.h 19 Jul 2017 22:04:46 -0000 1.29
+++ sys/net80211/ieee80211_ioctl.h 22 Oct 2017 08:37:57 -0000
@@ -151,18 +151,9 @@ struct ieee80211_power {
#define SIOCS80211POWER _IOW('i', 234, struct ieee80211_power)
#define SIOCG80211POWER _IOWR('i', 235, struct ieee80211_power)
-/* authentication type */
-struct ieee80211_auth {
- char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */
- int i_authtype;
-};
-
#define IEEE80211_AUTH_NONE 0
#define IEEE80211_AUTH_OPEN 1
#define IEEE80211_AUTH_SHARED 2
-
-#define SIOCS80211AUTH _IOW('i', 236, struct ieee80211_auth)
-#define SIOCG80211AUTH _IOWR('i', 237, struct ieee80211_auth)
/* channel request */
struct ieee80211chanreq {
Index: sys/dev/wscons/wsconsio.h
===================================================================
RCS file: /cvs/src/sys/dev/wscons/wsconsio.h,v
retrieving revision 1.85
diff -u -p -r1.85 wsconsio.h
--- sys/dev/wscons/wsconsio.h 18 Aug 2017 21:29:59 -0000 1.85
+++ sys/dev/wscons/wsconsio.h 22 Oct 2017 08:35:22 -0000
@@ -245,15 +245,6 @@ struct wskbd_encoding_data {
#define WSMOUSE_RES_DEFAULT 75
#define WSMOUSE_RES_MAX 100
-/* Set scale factor (num / den). Not applicable to all mouse types. */
-#define WSMOUSEIO_SSCALE _IOW('W', 34, u_int[2])
-
-/* Set sample rate. Not applicable to all mouse types. */
-#define WSMOUSEIO_SRATE _IOW('W', 35, u_int)
-#define WSMOUSE_RATE_MIN 0
-#define WSMOUSE_RATE_DEFAULT 50
-#define WSMOUSE_RATE_MAX 100
-
/* Set/get sample coordinates for calibration */
#define WSMOUSE_CALIBCOORDS_MAX 16
#define WSMOUSE_CALIBCOORDS_RESET -1
Index: sys/net/if_ppp.h
===================================================================
RCS file: /cvs/src/sys/net/if_ppp.h,v
retrieving revision 1.8
diff -u -p -r1.8 if_ppp.h
--- sys/net/if_ppp.h 1 Jul 2002 19:31:34 -0000 1.8
+++ sys/net/if_ppp.h 22 Oct 2017 08:24:24 -0000
@@ -138,10 +138,6 @@ struct ifpppcstatsreq {
#define PPPIOCSPASS _IOW('t', 71, struct bpf_program) /* set pass filter */
#define PPPIOCSACTIVE _IOW('t', 70, struct bpf_program) /* set active filt */
-/* PPPIOC[GS]MTU are alternatives to SIOC[GS]IFMTU, used under Ultrix */
-#define PPPIOCGMTU _IOR('t', 73, int) /* get interface MTU */
-#define PPPIOCSMTU _IOW('t', 72, int) /* set interface MTU */
-
/*
* These two are interface ioctls so that pppstats can do them on
* a socket without having to open the serial device.
Index: sys/netinet6/in6_var.h
===================================================================
RCS file: /cvs/src/sys/netinet6/in6_var.h,v
retrieving revision 1.69
diff -u -p -r1.69 in6_var.h
--- sys/netinet6/in6_var.h 15 Aug 2017 06:08:52 -0000 1.69
+++ sys/netinet6/in6_var.h 22 Oct 2017 08:32:23 -0000
@@ -294,10 +294,6 @@ struct in6_aliasreq {
#define SIOCDIFADDR_IN6 _IOW('i', 25, struct in6_ifreq)
#define SIOCAIFADDR_IN6 _IOW('i', 26, struct in6_aliasreq)
-#define SIOCSIFPHYADDR_IN6 _IOW('i', 70, struct in6_aliasreq)
-#define SIOCGIFPSRCADDR_IN6 _IOWR('i', 71, struct in6_ifreq)
-#define SIOCGIFPDSTADDR_IN6 _IOWR('i', 72, struct in6_ifreq)
-
#define SIOCGIFAFLAG_IN6 _IOWR('i', 73, struct in6_ifreq)
#define SIOCGIFINFO_IN6 _IOWR('i', 108, struct in6_ndireq)
Index: sys/sys/cdio.h
===================================================================
RCS file: /cvs/src/sys/sys/cdio.h,v
retrieving revision 1.16
diff -u -p -r1.16 cdio.h
--- sys/sys/cdio.h 23 Dec 2006 17:35:35 -0000 1.16
+++ sys/sys/cdio.h 22 Oct 2017 08:20:29 -0000
@@ -218,7 +218,6 @@ struct ioc_vol {
#define CDIOCALLOW _IO('c', 25)
#define CDIOCPREVENT _IO('c', 26)
#define CDIOCCLOSE _IO('c', 27)
-#define CDIOCSETCDDA _IOW('c', 28, int) /* (re)set CDDA reading mode */
struct ioc_play_msf {
u_char start_m;
Index: sys/sys/dkio.h
===================================================================
RCS file: /cvs/src/sys/sys/dkio.h,v
retrieving revision 1.11
diff -u -p -r1.11 dkio.h
--- sys/sys/dkio.h 29 Jul 2017 08:50:42 -0000 1.11
+++ sys/sys/dkio.h 22 Oct 2017 10:02:22 -0000
@@ -44,13 +44,6 @@
#define DIOCWDINFO _IOW('d', 103, struct disklabel)/* set, update disk */
#define DIOCGPART _IOW('d', 104, struct partinfo) /* get partition */
-/* do format operation, read or write */
-#define DIOCRFORMAT _IOWR('d', 105, struct format_op)
-#define DIOCWFORMAT _IOWR('d', 106, struct format_op)
-
-#define DIOCSSTEP _IOW('d', 107, int) /* set step rate */
-#define DIOCSRETRIES _IOW('d', 108, int) /* set # of retries */
-
#define DIOCEJECT _IO('d', 112) /* eject removable disk */
#define DIOCLOCK _IOW('d', 113, int) /* lock/unlock pack */
Index: sys/sys/disklabel.h
===================================================================
RCS file: /cvs/src/sys/sys/disklabel.h,v
retrieving revision 1.74
diff -u -p -r1.74 disklabel.h
--- sys/sys/disklabel.h 3 Nov 2015 13:59:07 -0000 1.74
+++ sys/sys/disklabel.h 22 Oct 2017 10:11:07 -0000
@@ -346,18 +346,6 @@ static char *fstypesnames[] = {
#ifndef _LOCORE
/*
- * Structure used to perform a format or other raw operation, returning
- * data and/or register values. Register identification and format
- * are device- and driver-dependent.
- */
-struct format_op {
- char *df_buf;
- int df_count; /* value-result */
- daddr_t df_startblk;
- int df_reg[8]; /* result */
-};
-
-/*
* Structure used internally to retrieve information about a partition
* on a disk.
*/
Index: sys/sys/sockio.h
===================================================================
RCS file: /cvs/src/sys/sys/sockio.h,v
retrieving revision 1.70
diff -u -p -r1.70 sockio.h
--- sys/sys/sockio.h 27 Jun 2017 22:18:24 -0000 1.70
+++ sys/sys/sockio.h 22 Oct 2017 08:34:04 -0000
@@ -38,10 +38,6 @@
#include <sys/ioccom.h>
/* Socket ioctl's. */
-#define SIOCSHIWAT _IOW('s', 0, int) /* set high
watermark */
-#define SIOCGHIWAT _IOR('s', 1, int) /* get high
watermark */
-#define SIOCSLOWAT _IOW('s', 2, int) /* set low
watermark */
-#define SIOCGLOWAT _IOR('s', 3, int) /* get low
watermark */
#define SIOCATMARK _IOR('s', 7, int) /* at oob mark?
*/
#define SIOCSPGRP _IOW('s', 8, int) /* set process
group */
#define SIOCGPGRP _IOR('s', 9, int) /* get process
group */
@@ -79,15 +75,11 @@
#define SIOCSIFMEDIA _IOWR('i', 55, struct ifreq) /* set net
media */
#define SIOCGIFMEDIA _IOWR('i', 56, struct ifmediareq) /* get net
media */
-#define SIOCSIFPHYADDR _IOW('i', 70, struct ifaliasreq) /* set gif address */
-#define SIOCGIFPSRCADDR _IOWR('i', 71, struct ifreq) /* get gif psrc
addr */
-#define SIOCGIFPDSTADDR _IOWR('i', 72, struct ifreq) /* get gif pdst
addr */
#define SIOCDIFPHYADDR _IOW('i', 73, struct ifreq) /* delete gif
addrs */
#define SIOCSLIFPHYADDR _IOW('i', 74, struct if_laddrreq) /* set gif
addrs */
#define SIOCGLIFPHYADDR _IOWR('i', 75, struct if_laddrreq) /* get gif
addrs */
#define SIOCBRDGADD _IOW('i', 60, struct ifbreq) /* add bridge
ifs */
-#define SIOCBRDGGSIFS _IOWR('i', 60, struct ifbreq) /* get span ifs
*/
#define SIOCBRDGDEL _IOW('i', 61, struct ifbreq) /* del bridge
ifs */
#define SIOCBRDGGIFFLGS _IOWR('i', 62, struct ifbreq) /* get brdg if
flags */
#define SIOCBRDGSIFFLGS _IOW('i', 63, struct ifbreq) /* set brdg if
flags */
@@ -126,15 +118,11 @@
#define SIOCSWGDPID _IOWR('i', 91, struct ifbrparam)/* set datapath
id */
#define SIOCSWSDPID _IOW('i', 92, struct ifbrparam)/* get datapath
id */
#define SIOCSWGMAXGROUP _IOWR('i', 93, struct ifbrparam)/* get max
groups */
-#define SIOCSWSMAXGROUP _IOW('i', 94, struct ifbrparam)/* set max
groups */
#define SIOCSWSPORTNO _IOWR('i', 95, struct ifbreq) /* set port
number */
#define SIOCSWGMAXFLOW _IOWR('i', 96, struct ifbrparam)/* get max flow
per table */
-#define SIOCSWSMAXFLOW _IOW('i', 97, struct ifbrparam)/* set max flow
per table */
#define SIOCSIFMTU _IOW('i', 127, struct ifreq) /* set ifnet
mtu */
#define SIOCGIFMTU _IOWR('i', 126, struct ifreq) /* get ifnet
mtu */
-#define SIOCSIFASYNCMAP _IOW('i', 125, struct ifreq) /* set ppp
asyncmap */
-#define SIOCGIFASYNCMAP _IOWR('i', 124, struct ifreq) /* get ppp
asyncmap */
#define SIOCIFCREATE _IOW('i', 122, struct ifreq) /* create clone
if */
#define SIOCIFDESTROY _IOW('i', 121, struct ifreq) /* destroy
clone if */
Index: sys/arch/octeon/dev/amdcf.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/dev/amdcf.c,v
retrieving revision 1.3
diff -u -p -r1.3 amdcf.c
--- sys/arch/octeon/dev/amdcf.c 4 May 2017 22:47:27 -0000 1.3
+++ sys/arch/octeon/dev/amdcf.c 22 Oct 2017 10:01:23 -0000
@@ -533,33 +533,6 @@ amdcfioctl(dev_t dev, u_long xfer, caddr
disk_unlock(&sc->sc_dk);
goto exit;
-#ifdef notyet
- case DIOCWFORMAT:
- if ((flag & FWRITE) == 0)
- return EBADF;
- {
- struct format_op *fop;
- struct iovec aiov;
- struct uio auio;
-
- fop = (struct format_op *)addr;
- aiov.iov_base = fop->df_buf;
- aiov.iov_len = fop->df_count;
- auio.uio_iov = &aiov;
- auio.uio_iovcnt = 1;
- auio.uio_resid = fop->df_count;
- auio.uio_segflg = UIO_USERSPACE;
- auio.uio_offset =
- fop->df_startblk * sc->sc_dk.dk_label->d_secsize;
- auio.uio_procp = p;
- error = physio(scformat, dev, B_WRITE, minphys, &auio);
- fop->df_count -= auio.uio_resid;
- fop->df_reg[0] = scc->sc_status;
- fop->df_reg[1] = scc->sc_error;
- goto exit;
- }
-#endif
-
default:
error = ENOTTY;
goto exit;
Index: sys/arch/octeon/dev/octcf.c
===================================================================
RCS file: /cvs/src/sys/arch/octeon/dev/octcf.c,v
retrieving revision 1.29
diff -u -p -r1.29 octcf.c
--- sys/arch/octeon/dev/octcf.c 4 May 2017 22:47:27 -0000 1.29
+++ sys/arch/octeon/dev/octcf.c 22 Oct 2017 10:01:02 -0000
@@ -601,33 +601,6 @@ octcfioctl(dev_t dev, u_long xfer, caddr
disk_unlock(&wd->sc_dk);
goto exit;
-#ifdef notyet
- case DIOCWFORMAT:
- if ((flag & FWRITE) == 0)
- return EBADF;
- {
- struct format_op *fop;
- struct iovec aiov;
- struct uio auio;
-
- fop = (struct format_op *)addr;
- aiov.iov_base = fop->df_buf;
- aiov.iov_len = fop->df_count;
- auio.uio_iov = &aiov;
- auio.uio_iovcnt = 1;
- auio.uio_resid = fop->df_count;
- auio.uio_segflg = UIO_USERSPACE;
- auio.uio_offset =
- fop->df_startblk * wd->sc_dk.dk_label->d_secsize;
- auio.uio_procp = p;
- error = physio(wdformat, dev, B_WRITE, minphys, &auio);
- fop->df_count -= auio.uio_resid;
- fop->df_reg[0] = wdc->sc_status;
- fop->df_reg[1] = wdc->sc_error;
- goto exit;
- }
-#endif
-
default:
error = ENOTTY;
goto exit;
Index: sys/dev/ata/wd.c
===================================================================
RCS file: /cvs/src/sys/dev/ata/wd.c,v
retrieving revision 1.122
diff -u -p -r1.122 wd.c
--- sys/dev/ata/wd.c 29 May 2017 14:05:31 -0000 1.122
+++ sys/dev/ata/wd.c 22 Oct 2017 10:01:40 -0000
@@ -821,33 +821,6 @@ wdioctl(dev_t dev, u_long xfer, caddr_t
disk_unlock(&wd->sc_dk);
goto exit;
-#ifdef notyet
- case DIOCWFORMAT:
- if ((flag & FWRITE) == 0)
- return EBADF;
- {
- struct format_op *fop;
- struct iovec aiov;
- struct uio auio;
-
- fop = (struct format_op *)addr;
- aiov.iov_base = fop->df_buf;
- aiov.iov_len = fop->df_count;
- auio.uio_iov = &aiov;
- auio.uio_iovcnt = 1;
- auio.uio_resid = fop->df_count;
- auio.uio_segflg = UIO_USERSPACE;
- auio.uio_offset =
- fop->df_startblk * wd->sc_dk.dk_label->d_secsize;
- auio.uio_procp = p;
- error = physio(wdformat, dev, B_WRITE, minphys, &auio);
- fop->df_count -= auio.uio_resid;
- fop->df_reg[0] = wdc->sc_status;
- fop->df_reg[1] = wdc->sc_error;
- goto exit;
- }
-#endif
-
case DIOCCACHESYNC:
if ((flag & FWRITE) == 0) {
error = EBADF;
Index: sbin/wsconsctl/mouse.c
===================================================================
RCS file: /cvs/src/sbin/wsconsctl/mouse.c,v
retrieving revision 1.15
diff -u -p -r1.15 mouse.c
--- sbin/wsconsctl/mouse.c 1 Aug 2017 23:23:44 -0000 1.15
+++ sbin/wsconsctl/mouse.c 22 Oct 2017 09:15:27 -0000
@@ -144,12 +144,6 @@ mouse_put_values(int fd)
return 1;
}
}
- if (field_by_value(mouse_field_tab, &samplerate)->flags & FLG_SET) {
- if (ioctl(fd, WSMOUSEIO_SRATE, &samplerate) < 0) {
- warn("WSMOUSEIO_SRATE");
- return 1;
- }
- }
if (field_by_value(mouse_field_tab, &rawmode)->flags & FLG_SET) {
wmcoords.samplelen = rawmode;
if (ioctl(fd, WSMOUSEIO_SCALIBCOORDS, &wmcoords) < 0) {
Index: usr.sbin/wsmoused/wsmoused.c
===================================================================
RCS file: /cvs/src/usr.sbin/wsmoused/wsmoused.c,v
retrieving revision 1.36
diff -u -p -r1.36 wsmoused.c
--- usr.sbin/wsmoused/wsmoused.c 26 Oct 2015 09:58:18 -0000 1.36
+++ usr.sbin/wsmoused/wsmoused.c 22 Oct 2017 09:30:15 -0000
@@ -157,10 +157,8 @@ void
wsmouse_init(void)
{
unsigned int res = WSMOUSE_RES_MIN;
- unsigned int rate = WSMOUSE_RATE_DEFAULT;
ioctl(mouse.mfd, WSMOUSEIO_SRES, &res);
- ioctl(mouse.mfd, WSMOUSEIO_SRATE, &rate);
}
/*
Index: share/man/man4/bridge.4
===================================================================
RCS file: /cvs/src/share/man/man4/bridge.4,v
retrieving revision 1.75
diff -u -p -r1.75 bridge.4
--- share/man/man4/bridge.4 4 Sep 2016 18:55:08 -0000 1.75
+++ share/man/man4/bridge.4 22 Oct 2017 09:26:30 -0000
@@ -510,12 +510,6 @@ struct ifbrlconf {
#define ifbrl_req ifbrl_ifbrlu.ifbrlu_req
};
.Ed
-.\" .It Dv SIOCBRDGGSIFS Fa "struct ifbreq *"
-.It Dv SIOCBRDGGPRI Fa "struct ifbrparam *"
-Retrieve the Spanning Tree Protocol (STP) priority parameter of the bridge into
-the
-.Va ifbrp_prio
-field.
.It Dv SIOCBRDGSPRI Fa "struct ifbrparam *"
Set the STP priority parameter of the bridge to the value in
.Va ifbrp_prio .
Index: share/man/man4/switch.4
===================================================================
RCS file: /cvs/src/share/man/man4/switch.4,v
retrieving revision 1.7
diff -u -p -r1.7 switch.4
--- share/man/man4/switch.4 28 Nov 2016 11:46:26 -0000 1.7
+++ share/man/man4/switch.4 22 Oct 2017 09:29:19 -0000
@@ -130,25 +130,12 @@ of the switch named in
into the
.Va ifbrp_maxflow
field.
-.It Dv SIOCSWSMAXFLOW Fa "struct ifbrparam"
-Set the maximum number of flows in the OpenFlow protocol of the switch named in
-.Va ifbrp_name
-to the value in the
-.Va ifbrpu_maxflow
-field.
.It Dv SIOCSWGMAXGROUP Fa "struct ifbrparam"
Retrieve the maximum number of groups in the OpenFlow protocol
of the switch named
in
.Va ifbrp_name
into the
-.Va ifbrpu_maxgroup
-field.
-.It Dv SIOCSWSMAXGROUP Fa "struct ifbrparam"
-Set the maximum number of groups in the OpenFlow protocol
-of the switch named in
-.Va ifbrp_name
-to the value in the
.Va ifbrpu_maxgroup
field.
.It Dv SIOCSWSPORTNO Fa "struct ifbreq"
