| ieee80211_proto.c (147765) | ieee80211_proto.c (148290) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 17 unchanged lines hidden (view full) --- 26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting 4 * All rights reserved. 5 * 6 * Redistribution and use in source and binary forms, with or without 7 * modification, are permitted provided that the following conditions 8 * are met: --- 17 unchanged lines hidden (view full) --- 26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_proto.c 147765 2005-07-04 01:29:41Z sam $"); | 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_proto.c 148290 2005-07-22 16:50:18Z sam $"); |
| 35 36/* 37 * IEEE 802.11 protocol support. 38 */ 39 40#include "opt_inet.h" 41 42#include <sys/param.h> --- 52 unchanged lines hidden (view full) --- 95 ifp->if_hdrlen = sizeof(struct ieee80211_qosframe_addr4); 96 97#ifdef notdef 98 ic->ic_rtsthreshold = IEEE80211_RTS_DEFAULT; 99#else 100 ic->ic_rtsthreshold = IEEE80211_RTS_MAX; 101#endif 102 ic->ic_fragthreshold = 2346; /* XXX not used yet */ | 35 36/* 37 * IEEE 802.11 protocol support. 38 */ 39 40#include "opt_inet.h" 41 42#include <sys/param.h> --- 52 unchanged lines hidden (view full) --- 95 ifp->if_hdrlen = sizeof(struct ieee80211_qosframe_addr4); 96 97#ifdef notdef 98 ic->ic_rtsthreshold = IEEE80211_RTS_DEFAULT; 99#else 100 ic->ic_rtsthreshold = IEEE80211_RTS_MAX; 101#endif 102 ic->ic_fragthreshold = 2346; /* XXX not used yet */ |
| 103 ic->ic_fixed_rate = -1; /* no fixed rate */ | 103 ic->ic_fixed_rate = IEEE80211_FIXED_RATE_NONE; |
| 104 ic->ic_protmode = IEEE80211_PROT_CTSONLY; 105 ic->ic_roaming = IEEE80211_ROAMING_AUTO; 106 107 ic->ic_wme.wme_hipri_switch_hysteresis = 108 AGGRESSIVE_MODE_SWITCH_HYSTERESIS; 109 110 mtx_init(&ic->ic_mgtq.ifq_mtx, ifp->if_xname, "mgmt send q", MTX_DEF); 111 --- 218 unchanged lines hidden (view full) --- 330 int okrate, badrate, fixedrate; 331 struct ieee80211_rateset *srs, *nrs; 332 u_int8_t r; 333 334 /* 335 * If the fixed rate check was requested but no 336 * fixed has been defined then just remove it. 337 */ | 104 ic->ic_protmode = IEEE80211_PROT_CTSONLY; 105 ic->ic_roaming = IEEE80211_ROAMING_AUTO; 106 107 ic->ic_wme.wme_hipri_switch_hysteresis = 108 AGGRESSIVE_MODE_SWITCH_HYSTERESIS; 109 110 mtx_init(&ic->ic_mgtq.ifq_mtx, ifp->if_xname, "mgmt send q", MTX_DEF); 111 --- 218 unchanged lines hidden (view full) --- 330 int okrate, badrate, fixedrate; 331 struct ieee80211_rateset *srs, *nrs; 332 u_int8_t r; 333 334 /* 335 * If the fixed rate check was requested but no 336 * fixed has been defined then just remove it. 337 */ |
| 338 if ((flags & IEEE80211_F_DOFRATE) && ic->ic_fixed_rate < 0) | 338 if ((flags & IEEE80211_F_DOFRATE) && 339 ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) |
| 339 flags &= ~IEEE80211_F_DOFRATE; 340 error = 0; 341 okrate = badrate = fixedrate = 0; 342 srs = &ic->ic_sup_rates[ieee80211_chan2mode(ic, ni->ni_chan)]; 343 nrs = &ni->ni_rates; 344 for (i = 0; i < nrs->rs_nrates; ) { 345 ignore = 0; 346 if (flags & IEEE80211_F_DOSORT) { --- 737 unchanged lines hidden --- | 340 flags &= ~IEEE80211_F_DOFRATE; 341 error = 0; 342 okrate = badrate = fixedrate = 0; 343 srs = &ic->ic_sup_rates[ieee80211_chan2mode(ic, ni->ni_chan)]; 344 nrs = &ni->ni_rates; 345 for (i = 0; i < nrs->rs_nrates; ) { 346 ignore = 0; 347 if (flags & IEEE80211_F_DOSORT) { --- 737 unchanged lines hidden --- |