diff options
| author | sam <sam@FreeBSD.org> | 2005-07-22 16:55:27 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2005-07-22 16:55:27 +0000 |
| commit | 6f738197e30b168d8c1ed5190c408fc80bd58984 (patch) | |
| tree | e4240c44a5476ba798678ab2a8906d3372cd5cb4 /sys | |
| parent | 3876d0ac68eed6f2676486ce047b20f7cb8f3520 (diff) | |
| download | FreeBSD-src-6f738197e30b168d8c1ed5190c408fc80bd58984.zip FreeBSD-src-6f738197e30b168d8c1ed5190c408fc80bd58984.tar.gz | |
o add IEEE80211_FRAG_DEFAULT
o move default settings for RTS and frag thresholds to ieee80211_var.h
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net80211/ieee80211.h | 14 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_proto.c | 6 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_var.h | 3 |
3 files changed, 15 insertions, 8 deletions
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h index c6dcce4..61b5bd6 100644 --- a/sys/net80211/ieee80211.h +++ b/sys/net80211/ieee80211.h @@ -622,10 +622,18 @@ enum { /* * RTS frame length parameters. The default is specified in - * the 802.11 spec. The max may be wrong for jumbo frames. + * the 802.11 spec as 512; we treat it as implementation-dependent + * so it's defined in ieee80211_var.h. The max may be wrong + * for jumbo frames. */ -#define IEEE80211_RTS_DEFAULT 512 #define IEEE80211_RTS_MIN 1 -#define IEEE80211_RTS_MAX IEEE80211_MAX_LEN +#define IEEE80211_RTS_MAX 2346 + +/* + * TX fragmentation parameters. As above for RTS, we treat + * default as implementation-dependent so define it elsewhere. + */ +#define IEEE80211_FRAG_MIN 256 +#define IEEE80211_FRAG_MAX 2346 #endif /* _NET80211_IEEE80211_H_ */ diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 0fe4574..76ef0b5 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -94,12 +94,8 @@ ieee80211_proto_attach(struct ieee80211com *ic) /* XXX room for crypto */ ifp->if_hdrlen = sizeof(struct ieee80211_qosframe_addr4); -#ifdef notdef ic->ic_rtsthreshold = IEEE80211_RTS_DEFAULT; -#else - ic->ic_rtsthreshold = IEEE80211_RTS_MAX; -#endif - ic->ic_fragthreshold = 2346; /* XXX not used yet */ + ic->ic_fragthreshold = IEEE80211_FRAG_DEFAULT; ic->ic_fixed_rate = IEEE80211_FIXED_RATE_NONE; ic->ic_protmode = IEEE80211_PROT_CTSONLY; ic->ic_roaming = IEEE80211_ROAMING_AUTO; diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index d4959af..07f3f84 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -74,6 +74,9 @@ #define IEEE80211_FIXED_RATE_NONE -1 +#define IEEE80211_RTS_DEFAULT IEEE80211_RTS_MAX +#define IEEE80211_FRAG_DEFAULT IEEE80211_FRAG_MAX + #define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024) #define IEEE80211_TU_TO_MS(x) (((x) * 1024) / 1000) |
