Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only Prism is known to support WI_RID_FRAG_THRESH.

This commit is contained in:
dyoung 2002-11-18 15:10:22 +00:00
parent eeca0be61b
commit 1b3451a594
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sys/dev/ic/wi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wi.c,v 1.103 2002/11/16 06:25:05 dyoung Exp $ */
/* $NetBSD: wi.c,v 1.104 2002/11/18 15:10:22 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.103 2002/11/16 06:25:05 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.104 2002/11/18 15:10:22 dyoung Exp $");
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
@ -294,6 +294,7 @@ wi_attach(struct wi_softc *sc)
break;
case WI_INTERSIL:
sc->sc_flags |= WI_FLAGS_HAS_FRAGTHR;
sc->sc_flags |= WI_FLAGS_HAS_ROAMING;
sc->sc_flags |= WI_FLAGS_HAS_SYSSCALE;
if (sc->sc_sta_firmware_ver >= 800) {
@ -573,7 +574,8 @@ wi_init(struct ifnet *ifp)
/* not yet common 802.11 configuration */
wi_write_val(sc, WI_RID_MAX_DATALEN, sc->sc_max_datalen);
wi_write_val(sc, WI_RID_RTS_THRESH, sc->sc_rts_thresh);
wi_write_val(sc, WI_RID_FRAG_THRESH, sc->sc_frag_thresh);
if (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)
wi_write_val(sc, WI_RID_FRAG_THRESH, sc->sc_frag_thresh);
/* driver specific 802.11 configuration */
if (sc->sc_flags & WI_FLAGS_HAS_SYSSCALE)
@ -1461,6 +1463,16 @@ wi_get_cfg(struct ifnet *ifp, u_long cmd, caddr_t data)
len = sizeof(u_int16_t);
break;
case WI_RID_FRAG_THRESH:
if (sc->sc_enabled && (sc->sc_flags & WI_FLAGS_HAS_FRAGTHR)) {
error = wi_read_rid(sc, wreq.wi_type, wreq.wi_val,
&len);
break;
}
wreq.wi_val[0] = htole16(sc->sc_frag_thresh);
len = sizeof(u_int16_t);
break;
case WI_RID_READ_APS:
if (ic->ic_opmode == IEEE80211_M_HOSTAP)
return ieee80211_cfgget(ifp, cmd, data);
@ -1492,10 +1504,6 @@ wi_get_cfg(struct ifnet *ifp, u_long cmd, caddr_t data)
wreq.wi_val[0] = htole16(sc->sc_max_datalen);
len = sizeof(u_int16_t);
break;
case WI_RID_FRAG_THRESH:
wreq.wi_val[0] = htole16(sc->sc_frag_thresh);
len = sizeof(u_int16_t);
break;
case WI_RID_RTS_THRESH:
wreq.wi_val[0] = htole16(sc->sc_rts_thresh);
len = sizeof(u_int16_t);
@ -1559,6 +1567,7 @@ wi_set_cfg(struct ifnet *ifp, u_long cmd, caddr_t data)
case WI_RID_MICROWAVE_OVEN:
case WI_RID_ROAMING_MODE:
case WI_RID_SYSTEM_SCALE:
case WI_RID_FRAG_THRESH:
if (wreq.wi_type == WI_RID_MICROWAVE_OVEN &&
(sc->sc_flags & WI_FLAGS_HAS_MOR) == 0)
break;
@ -1568,8 +1577,10 @@ wi_set_cfg(struct ifnet *ifp, u_long cmd, caddr_t data)
if (wreq.wi_type == WI_RID_SYSTEM_SCALE &&
(sc->sc_flags & WI_FLAGS_HAS_SYSSCALE) == 0)
break;
if (wreq.wi_type == WI_RID_FRAG_THRESH &&
(sc->sc_flags & WI_FLAGS_HAS_FRAGTHR) == 0)
break;
/* FALLTHROUGH */
case WI_RID_FRAG_THRESH:
case WI_RID_RTS_THRESH:
case WI_RID_CNFAUTHMODE:
case WI_RID_MAX_DATALEN:

3
sys/dev/ic/wivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: wivar.h,v 1.24 2002/11/16 06:02:54 dyoung Exp $ */
/* $NetBSD: wivar.h,v 1.25 2002/11/18 15:10:22 dyoung Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@ -108,6 +108,7 @@ struct wi_softc {
#define WI_FLAGS_HAS_DIVERSITY 0x0040
#define WI_FLAGS_HAS_SYSSCALE 0x0080
#define WI_FLAGS_BUG_AUTOINC 0x0100
#define WI_FLAGS_HAS_FRAGTHR 0x0200
struct wi_card_ident {
u_int16_t card_id;