svn commit: r192492 - head/sys/dev/wi

[Warner Losh]

Author: imp
Date: Wed May 20 22:28:55 2009
New Revision: 192492
URL: http://svn.freebsd.org/changeset/base/192492

Log:
  Revert last junk...

Modified:
  head/sys/dev/wi/if_wavelan_ieee.h
  head/sys/dev/wi/if_wi.c
  head/sys/dev/wi/if_wivar.h

Modified: head/sys/dev/wi/if_wavelan_ieee.h
==============================================================================
--- head/sys/dev/wi/if_wavelan_ieee.h	Wed May 20 22:28:39 2009	(r192491)
+++ head/sys/dev/wi/if_wavelan_ieee.h	Wed May 20 22:28:55 2009	(r192492)
@@ -58,11 +58,14 @@
  * value.
  */
 #define WI_MAX_DATALEN	512
+
+#if 0
 struct wi_req {
 	u_int16_t	wi_len;
 	u_int16_t	wi_type;
 	u_int16_t	wi_val[WI_MAX_DATALEN];
 };
+#endif
 
 /*
  * Private LTV records (interpreted only by the driver). This is

Modified: head/sys/dev/wi/if_wi.c
==============================================================================
--- head/sys/dev/wi/if_wi.c	Wed May 20 22:28:39 2009	(r192491)
+++ head/sys/dev/wi/if_wi.c	Wed May 20 22:28:55 2009	(r192492)
@@ -145,6 +145,7 @@ static int  wi_alloc_fid(struct wi_softc
 static void wi_read_nicid(struct wi_softc *);
 static int  wi_write_ssid(struct wi_softc *, int, u_int8_t *, int);
 
+static int  wi_cmd(struct wi_softc *, int, int, int, int);
 static int  wi_seek_bap(struct wi_softc *, int, int);
 static int  wi_read_bap(struct wi_softc *, int, int, void *, int);
 static int  wi_write_bap(struct wi_softc *, int, int, void *, int);
@@ -1801,7 +1802,7 @@ wi_write_wep(struct wi_softc *sc, struct
 	return error;
 }
 
-int
+static int
 wi_cmd(struct wi_softc *sc, int cmd, int val0, int val1, int val2)
 {
 	int i, s = 0;
@@ -2120,5 +2121,3 @@ wi_free(device_t dev)
 		sc->mem = NULL;
 	}
 }
-
-MODULE_VERSION(wi, 1);

Modified: head/sys/dev/wi/if_wivar.h
==============================================================================
--- head/sys/dev/wi/if_wivar.h	Wed May 20 22:28:39 2009	(r192491)
+++ head/sys/dev/wi/if_wivar.h	Wed May 20 22:28:55 2009	(r192492)
@@ -184,6 +184,3 @@ void	wi_init(void *);
 void	wi_intr(void *);
 int	wi_mgmt_xmit(struct wi_softc *, caddr_t, int);
 void	wi_stop(struct wi_softc *, int);
-
-/* KLUDGE */
-int	wi_cmd(struct wi_softc *, int, int, int, int);