diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2004-12-05 00:16:15 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2004-12-05 00:16:15 +0000 |
| commit | 7c303f4261ec322e76e43d24ef76d7a57ad5da64 (patch) | |
| tree | 0941c52a790606936b9937e193f52bb68742d0fc /sys | |
| parent | 07a5f4616f006459591a72a1877123ba83c8519b (diff) | |
remove the dependance on code from wi
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/if_atu.c | 37 | ||||
| -rw-r--r-- | sys/dev/usb/if_atureg.h | 8 |
2 files changed, 5 insertions, 40 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c index 68ed5d99e88..b97663f87c3 100644 --- a/sys/dev/usb/if_atu.c +++ b/sys/dev/usb/if_atu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atu.c,v 1.30 2004/12/04 23:56:49 dlg Exp $ */ +/* $OpenBSD: if_atu.c,v 1.31 2004/12/05 00:16:14 dlg Exp $ */ /* * Copyright (c) 2003, 2004 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -81,8 +81,6 @@ #include <netinet/if_ether.h> #endif -#include <dev/ic/if_wi_ieee.h> - #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_radiotap.h> @@ -2204,7 +2202,6 @@ atu_ioctl(struct ifnet *ifp, u_long command, caddr_t data) int len = 0; #endif struct ieee80211_nwid nwid; - struct wi_req wreq; int change, s; s = splnet(); @@ -2604,38 +2601,6 @@ atu_ioctl(struct ifnet *ifp, u_long command, caddr_t data) break; #endif - case SIOCGWAVELAN: - DPRINTFN(15, ("%s: ioctl: get wavelan\n", - USBDEVNAME(sc->atu_dev))); - /* - err = ether_ioctl(ifp, &sc->arpcom, command, data); - break; - */ - - /* TODO: implement */ - - err = copyin(ifr->ifr_data, &wreq, sizeof(wreq)); - if (err) - break; - - DPRINTFN(15, ("%s: SIOCGWAVELAN\n", USBDEVNAME(sc->atu_dev))); - if (wreq.wi_len > WI_MAX_DATALEN) { - err = EINVAL; - break; - } - - DPRINTFN(15, ("%s: ioctl: wi_type=%04x %d\n", - USBDEVNAME(sc->atu_dev), wreq.wi_type, wreq.wi_type)); - err = 0; - /* err = EINVAL; */ - break; - - case SIOCSWAVELAN: - DPRINTFN(15, ("%s: ioctl: wavset type=%x\n", - USBDEVNAME(sc->atu_dev), 0)); - err = 0; - break; - default: DPRINTFN(15, ("%s: default\n", USBDEVNAME(sc->atu_dev))); err = ieee80211_ioctl(ifp, command, data); diff --git a/sys/dev/usb/if_atureg.h b/sys/dev/usb/if_atureg.h index f0a64accfe2..cbc36db3c0e 100644 --- a/sys/dev/usb/if_atureg.h +++ b/sys/dev/usb/if_atureg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_atureg.h,v 1.12 2004/12/04 23:56:50 dlg Exp $ */ +/* $OpenBSD: if_atureg.h,v 1.13 2004/12/05 00:16:14 dlg Exp $ */ /* * Copyright (c) 2003 * Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved. @@ -32,7 +32,7 @@ * */ -/* $ATUWI: $Id: if_atureg.h,v 1.12 2004/12/04 23:56:50 dlg Exp $ */ +/* $ATUWI: $Id: if_atureg.h,v 1.13 2004/12/05 00:16:14 dlg Exp $ */ /************ driver options ************/ @@ -166,10 +166,10 @@ * According to the 802.11 spec (7.1.2) the frame body can be up to 2312 bytes */ #define ATU_RX_BUFSZ (ATU_RX_HDRLEN + \ - sizeof(struct wi_80211_hdr) + 2312 + 4) + sizeof(struct ieee80211_frame_addr4) + 2312 + 4) /* BE CAREFULL! should add ATU_TX_PADDING */ #define ATU_TX_BUFSZ (ATU_TX_HDRLEN + \ - sizeof(struct wi_80211_hdr) + 2312) + sizeof(struct ieee80211_frame_addr4) + 2312) #define ATU_MGMT_BUFSZ (ATU_TX_HDRLEN + 300) #define ATU_MIN_FRAMELEN 60 |