ieee80211_cfgget() and ieee80211_cfgset() are dead; ok jsg

3 files changed, 5 insertions, 25 deletions

diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index e261ac214ca..715159021f9 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.114 2006/05/29 00:56:50 mk Exp $
+#	$OpenBSD: Makefile,v 1.115 2006/06/24 14:14:30 deraadt Exp $
 #	$NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
@@ -141,8 +141,6 @@ MLINKS+=ieee80211_crypto.9 ieee80211_crypto_attach.9 \
 	ieee80211_crypto.9 ieee80211_wep_crypt.9
 MLINKS+=ieee80211_input.9 ieee80211_decap.9 \
 	ieee80211_input.9 ieee80211_recv_mgmt.9
-MLINKS+=ieee80211_ioctl.9 ieee80211_cfgget.9 \
-	ieee80211_ioctl.9 ieee80211_cfgset.9
 MLINKS+=ieee80211_node.9 ieee80211_node_attach.9 \
 	ieee80211_node.9 ieee80211_node_lateattach.9 \
 	ieee80211_node.9 ieee80211_node_detach.9 \
diff --git a/share/man/man9/ieee80211_ioctl.9 b/share/man/man9/ieee80211_ioctl.9
index 6914cb4371d..f43c2edecf1 100644
--- a/share/man/man9/ieee80211_ioctl.9
+++ b/share/man/man9/ieee80211_ioctl.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ieee80211_ioctl.9,v 1.2 2005/09/30 20:34:25 jaredy Exp $
+.\"	$OpenBSD: ieee80211_ioctl.9,v 1.3 2006/06/24 14:14:30 deraadt Exp $
 .\"
 .\" Copyright (c) 2004 Bruce M. Simpson <bms@spc.org>
 .\" Copyright (c) 2004 Darron Broad <darron@kewl.org>
@@ -26,23 +26,19 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/ieee80211_ioctl.9,v 1.2 2004/07/07 12:59:39 ru Exp $
-.\" $Id: ieee80211_ioctl.9,v 1.2 2005/09/30 20:34:25 jaredy Exp $
+.\" $Id: ieee80211_ioctl.9,v 1.3 2006/06/24 14:14:30 deraadt Exp $
 .\"
 .Dd March 2, 2004
 .Dt IEEE80211_IOCTL 9
 .Os
 .Sh NAME
-.Nm ieee80211_cfgget , ieee80211_cfgset , ieee80211_ioctl
+.Nm ieee80211_ioctl
 .Nd 802.11 interface ioctl commands
 .Sh SYNOPSIS
 .In net80211/ieee80211_var.h
 .In net80211/ieee80211_proto.h
 .In net80211/ieee80211_ioctl.h
 .Ft int
-.Fn ieee80211_cfgget "struct ifnet *ifp" "u_long cmd" "caddr_t data"
-.Ft int
-.Fn ieee80211_cfgset "struct ifnet *ifp" "u_long cmd" "caddr_t data"
-.Ft int
 .Fn ieee80211_ioctl "struct ifnet *ifp" "u_long cmd" "caddr_t data"
 .Sh DESCRIPTION
 These
@@ -51,17 +47,6 @@ for information or to change settings from the userland.
 .Pp
 .\"
 The
-.Fn ieee80211_cfgget
-and
-.Fn ieee80211_cfgset
-functions implement a legacy interface for getting and setting 802.11
-interface attributes respectively.
-The interface is compatible with the RIDs used by the
-.Xr wicontrol 8
-utility.
-.Pp
-.\"
-The
 .Fn ieee80211_ioctl
 function provides a default implementation of the
 .Dv SIOCS80211
@@ -79,7 +64,6 @@ to use this as the catch-all in a switch statement to avoid code duplication.
 .\"
 .Sh SEE ALSO
 .Xr ifconfig 8 ,
-.Xr wicontrol 8 ,
 .Xr ieee80211 9
 .Sh HISTORY
 The
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h
index bb09f56ff03..11f9c1a22fa 100644
--- a/sys/net80211/ieee80211_var.h
+++ b/sys/net80211/ieee80211_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_var.h,v 1.14 2006/06/23 21:34:15 reyk Exp $	*/
+/*	$OpenBSD: ieee80211_var.h,v 1.15 2006/06/24 14:14:18 deraadt Exp $	*/
 /*	$NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $	*/
 
 /*-
@@ -275,8 +275,6 @@ int	ieee80211_media_change(struct ifnet *);
 void	ieee80211_media_status(struct ifnet *, struct ifmediareq *);
 int	ieee80211_ioctl(struct ifnet *, u_long, caddr_t);
 int	ieee80211_get_rate(struct ieee80211com *);
-int	ieee80211_cfgget(struct ifnet *, u_long, caddr_t);
-int	ieee80211_cfgset(struct ifnet *, u_long, caddr_t);
 void	ieee80211_watchdog(struct ifnet *);
 int	ieee80211_fix_rate(struct ieee80211com *, struct ieee80211_node *, int);
 int	ieee80211_rate2media(struct ieee80211com *, int,