d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

o add IEEE80211_FRAG_DEFAULT

Browse Source 
o move default settings for RTS and frag thresholds to ieee80211_var.h
This commit is contained in:
Sam Leffler 2005-07-22 16:55:27 +00:00
parent 2c39b32c94
commit 33acb1cec1
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net80211/ieee80211.h
View File

@ -622,10 +622,18 @@ enum {
/* /*
* RTS frame length parameters. The default is specified in * 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_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_ */ #endif /* _NET80211_IEEE80211_H_ */

6
sys/net80211/ieee80211_proto.c
View File

@ -94,12 +94,8 @@ ieee80211_proto_attach(struct ieee80211com *ic)
/* XXX room for crypto */ /* XXX room for crypto */
ifp->if_hdrlen = sizeof(struct ieee80211_qosframe_addr4); ifp->if_hdrlen = sizeof(struct ieee80211_qosframe_addr4);
#ifdef notdef
ic->ic_rtsthreshold = IEEE80211_RTS_DEFAULT; ic->ic_rtsthreshold = IEEE80211_RTS_DEFAULT;
#else ic->ic_fragthreshold = IEEE80211_FRAG_DEFAULT;
ic->ic_rtsthreshold = IEEE80211_RTS_MAX;
#endif
ic->ic_fragthreshold = 2346; /* XXX not used yet */
ic->ic_fixed_rate = IEEE80211_FIXED_RATE_NONE; ic->ic_fixed_rate = IEEE80211_FIXED_RATE_NONE;
ic->ic_protmode = IEEE80211_PROT_CTSONLY; ic->ic_protmode = IEEE80211_PROT_CTSONLY;
ic->ic_roaming = IEEE80211_ROAMING_AUTO; ic->ic_roaming = IEEE80211_ROAMING_AUTO;

3
sys/net80211/ieee80211_var.h
View File

@ -74,6 +74,9 @@
#define IEEE80211_FIXED_RATE_NONE -1 #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_MS_TO_TU(x) (((x) * 1000) / 1024)
#define IEEE80211_TU_TO_MS(x) (((x) * 1024) / 1000) #define IEEE80211_TU_TO_MS(x) (((x) * 1024) / 1000)