get rid of shared auth mode.

the ioctl is not supported by ifconfig and it has never worked anyway.

4 files changed, 10 insertions, 42 deletions

diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index e7c17df7f86..45873fd863d 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.60 2006/08/19 11:16:55 damien Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.61 2006/08/19 12:03:05 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004-2006
@@ -263,9 +263,6 @@ ipw_attach(struct device *parent, struct device *self, void *aux)
 		ic->ic_channels[i].ic_flags = IEEE80211_CHAN_B;
 	}
 
-	/* default to authmode OPEN */
-	sc->authmode = IEEE80211_AUTH_OPEN;
-
 	/* IBSS channel undefined for now */
 	ic->ic_ibss_chan = &ic->ic_channels[0];
 
@@ -1126,7 +1123,7 @@ ipw_cmd(struct ipw_softc *sc, uint32_t type, void *data, uint32_t len)
 	sbd->bd->len = htole32(sizeof (struct ipw_cmd));
 	sbd->bd->nfrag = 1;
 	sbd->bd->flags = IPW_BD_FLAG_TX_FRAME_COMMAND |
-			 IPW_BD_FLAG_TX_LAST_FRAGMENT;
+	    IPW_BD_FLAG_TX_LAST_FRAGMENT;
 
 	bus_dmamap_sync(sc->sc_dmat, sc->cmd_map, 0, sizeof (struct ipw_cmd),
 	    BUS_DMASYNC_PREWRITE);
@@ -1443,18 +1440,6 @@ ipw_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		    IEEE80211_TXPOWER_MIN : sc->sc_ic.ic_txpower;
 		break;
 
-	case SIOCG80211AUTH:
-		((struct ieee80211_auth *)data)->i_authtype = sc->authmode;
-		break;
-
-	case SIOCS80211AUTH:
-		/* only super-user can do that! */
-		if ((error = suser(curproc, 0)) != 0)
-			break;
-
-		sc->authmode = ((struct ieee80211_auth *)data)->i_authtype;
-		break;
-
 	default:
 		error = ieee80211_ioctl(ifp, cmd, data);
 	}
@@ -1852,8 +1837,7 @@ ipw_config(struct ipw_softc *sc)
 	}
 
 	bzero(&security, sizeof security);
-	security.authmode = (sc->authmode == IEEE80211_AUTH_SHARED) ?
-	    IPW_AUTH_SHARED : IPW_AUTH_OPEN;
+	security.authmode = IPW_AUTH_OPEN;	/* XXX shared mode */
 	security.ciphers = htole32(IPW_CIPHER_NONE);
 	DPRINTF(("Setting authmode to %u\n", security.authmode));
 	error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFORMATION, &security,
diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h
index 333f7446afc..ccc61d078da 100644
--- a/sys/dev/pci/if_ipwvar.h
+++ b/sys/dev/pci/if_ipwvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipwvar.h,v 1.13 2006/02/26 19:14:40 damien Exp $	*/
+/*	$OpenBSD: if_ipwvar.h,v 1.14 2006/08/19 12:03:05 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004-2006
@@ -103,8 +103,6 @@ struct ipw_softc {
 	pcitag_t			sc_pcitag;
 	bus_size_t			sc_sz;
 
-	int				authmode;
-
 	int				sc_tx_timer;
 
 	bus_dma_tag_t			sc_dmat;
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index cb26043478d..26b7106fda1 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwi.c,v 1.71 2006/08/19 11:07:44 damien Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.72 2006/08/19 12:03:05 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004-2006
@@ -330,9 +330,6 @@ iwi_attach(struct device *parent, struct device *self, void *aux)
 		    IEEE80211_CHAN_DYN | IEEE80211_CHAN_2GHZ;
 	}
 
-	/* default to authmode OPEN */
-	sc->authmode = IEEE80211_AUTH_OPEN;
-
 	/* IBSS channel undefined for now */
 	ic->ic_ibss_chan = &ic->ic_channels[0];
 
@@ -1553,18 +1550,6 @@ iwi_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		    sc->sc_ic.ic_txpower : IEEE80211_TXPOWER_MIN;
 		break;
 
-	case SIOCG80211AUTH:
-		((struct ieee80211_auth *)data)->i_authtype = sc->authmode;
-		break;
-
-	case SIOCS80211AUTH:
-		/* only super-user can do that! */
-		if ((error = suser(curproc, 0)) != 0)
-			break;
-
-		sc->authmode = ((struct ieee80211_auth *)data)->i_authtype;
-		break;
-
 	default:
 		error = ieee80211_ioctl(ifp, cmd, data);
 	}
@@ -2127,8 +2112,11 @@ iwi_auth_and_assoc(struct iwi_softc *sc)
 	else	/* assume 802.11b/g */
 		assoc.mode = IWI_MODE_11G;
 	assoc.chan = ieee80211_chan2ieee(ic, ni->ni_chan);
-	if (sc->authmode == IEEE80211_AUTH_SHARED)
+
+#if 0
+	if (ni->ni_challenge != NULL)	/* XXX */
 		assoc.auth = (ic->ic_wep_txkey << 4) | IWI_AUTH_SHARED;
+#endif
 	if (ic->ic_flags & IEEE80211_F_SHPREAMBLE)
 		assoc.plen = IWI_ASSOC_SHPREAMBLE;
 	bcopy(ni->ni_tstamp, assoc.tstamp, 8);
diff --git a/sys/dev/pci/if_iwivar.h b/sys/dev/pci/if_iwivar.h
index 1f0fb64c72c..e1fe9800000 100644
--- a/sys/dev/pci/if_iwivar.h
+++ b/sys/dev/pci/if_iwivar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwivar.h,v 1.17 2006/04/01 15:36:01 mickey Exp $	*/
+/*	$OpenBSD: if_iwivar.h,v 1.18 2006/08/19 12:03:05 damien Exp $	*/
 
 /*-
  * Copyright (c) 2004-2006
@@ -121,8 +121,6 @@ struct iwi_softc {
 	pcitag_t		sc_pcitag;
 	bus_size_t		sc_sz;
 
-	int			authmode;
-
 	int			sc_tx_timer;
 
 	void			*powerhook;