diff options
author | Warner Losh <imp@FreeBSD.org> | 2009-05-20 22:28:55 +0000 |
---|---|---|
committer | Warner Losh <imp@FreeBSD.org> | 2009-05-20 22:28:55 +0000 |
commit | 68fc5ce70be924d656e19ec679f3c19a4b90dc7c (patch) | |
tree | 643e0486f22d401436e9ddba7bf8af2382062c88 | |
parent | 1fdc45cd2ebd4ae70453b1cf6465841fca911cc1 (diff) | |
download | src-68fc5ce70be924d656e19ec679f3c19a4b90dc7c.tar.gz src-68fc5ce70be924d656e19ec679f3c19a4b90dc7c.zip |
Revert last junk...
Notes
Notes:
svn path=/head/; revision=192492
-rw-r--r-- | sys/dev/wi/if_wavelan_ieee.h | 3 | ||||
-rw-r--r-- | sys/dev/wi/if_wi.c | 5 | ||||
-rw-r--r-- | sys/dev/wi/if_wivar.h | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/wi/if_wavelan_ieee.h b/sys/dev/wi/if_wavelan_ieee.h index 82bc9e509c2c..0061e638bd0d 100644 --- a/sys/dev/wi/if_wavelan_ieee.h +++ b/sys/dev/wi/if_wavelan_ieee.h @@ -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 diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c index 5cdec5f8506e..6e2c586c309a 100644 --- a/sys/dev/wi/if_wi.c +++ b/sys/dev/wi/if_wi.c @@ -145,6 +145,7 @@ static int wi_alloc_fid(struct wi_softc *, int, int *); 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 ieee80211vap *vap) 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); diff --git a/sys/dev/wi/if_wivar.h b/sys/dev/wi/if_wivar.h index c5bc1391ad4e..fd622bd754f2 100644 --- a/sys/dev/wi/if_wivar.h +++ b/sys/dev/wi/if_wivar.h @@ -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); |