Changeset 1856
- Timestamp:
- 12/14/06 02:38:00 (2 years ago)
- Files:
-
- trunk/net80211/ieee80211_input.c (modified) (2 diffs)
- trunk/net80211/ieee80211_ioctl.h (modified) (1 diff)
- trunk/net80211/ieee80211_node.c (modified) (1 diff)
- trunk/net80211/ieee80211_wireless.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/net80211/ieee80211_input.c
r1849 r1856 3472 3472 */ 3473 3473 if (IEEE80211_IS_CHAN_A(ic->ic_curchan) || 3474 (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE)) { 3474 ((ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) && 3475 (ic->ic_caps & IEEE80211_C_SHPREAMBLE))) { 3475 3476 ic->ic_flags |= IEEE80211_F_SHPREAMBLE; 3476 3477 ic->ic_flags &= ~IEEE80211_F_USEBARKER; … … 3497 3498 "%sassoc success: %s preamble, %s slot time%s%s%s%s%s%s%s", 3498 3499 ISREASSOC(subtype) ? "re" : "", 3499 ic->ic_flags&IEEE80211_F_SHPREAMBLE ? "short" : "long", 3500 (ic->ic_flags&IEEE80211_F_SHPREAMBLE) && 3501 (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) ? "short" : "long", 3500 3502 ic->ic_flags&IEEE80211_F_SHSLOT ? "short" : "long", 3501 3503 ic->ic_flags&IEEE80211_F_USEPROT ? ", protection" : "", trunk/net80211/ieee80211_ioctl.h
r1756 r1856 599 599 IEEE80211_PARAM_REGCLASS = 59, /* enable regclass ids in country IE */ 600 600 IEEE80211_PARAM_DROPUNENC_EAPOL = 60, /* drop unencrypted eapol frames */ 601 IEEE80211_PARAM_SHPREAMBLE = 61, /* Short Preamble */ 601 602 }; 602 603 trunk/net80211/ieee80211_node.c
r1821 r1856 1846 1846 newassoc ? "" : "re", 1847 1847 IEEE80211_NODE_AID(ni), 1848 ic->ic_flags & IEEE80211_F_SHPREAMBLE ? "short" : "long", 1848 (ic->ic_flags & IEEE80211_F_SHPREAMBLE) && 1849 (ni->ni_capinfo & IEEE80211_CAPINFO_SHORT_PREAMBLE) ? "short" : "long", 1849 1850 ic->ic_flags & IEEE80211_F_SHSLOT ? "short" : "long", 1850 1851 ic->ic_flags & IEEE80211_F_USEPROT ? ", protection" : "", trunk/net80211/ieee80211_wireless.c
r1849 r1856 2377 2377 retv = ENETRESET; /* XXX: need something this drastic? */ 2378 2378 break; 2379 case IEEE80211_PARAM_SHPREAMBLE: 2380 if (value) { 2381 ic->ic_caps |= IEEE80211_C_SHPREAMBLE; 2382 ic->ic_flags |= IEEE80211_F_SHPREAMBLE; 2383 ic->ic_flags &= ~IEEE80211_F_USEBARKER; 2384 } else { 2385 ic->ic_caps &= ~IEEE80211_C_SHPREAMBLE; 2386 ic->ic_flags &= ~IEEE80211_F_SHPREAMBLE; 2387 ic->ic_flags |= IEEE80211_F_USEBARKER; 2388 } 2389 retv = ENETRESET; /* requires restart */ 2390 break; 2379 2391 case IEEE80211_PARAM_PWRTARGET: 2380 2392 ic->ic_curchanmaxpwr = value; … … 2772 2784 case IEEE80211_PARAM_DOTH: 2773 2785 param[0] = (ic->ic_flags & IEEE80211_F_DOTH) != 0; 2786 break; 2787 case IEEE80211_PARAM_SHPREAMBLE: 2788 param[0] = (ic->ic_caps & IEEE80211_C_SHPREAMBLE) != 0; 2774 2789 break; 2775 2790 case IEEE80211_PARAM_PWRTARGET: … … 5087 5102 { IEEE80211_PARAM_DROPUNENC_EAPOL, 5088 5103 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_dropunencea" }, 5104 { IEEE80211_PARAM_SHPREAMBLE, 5105 IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "shpreamble" }, 5106 { IEEE80211_PARAM_SHPREAMBLE, 5107 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_shpreamble" }, 5089 5108 /* 5090 5109 * NB: these should be roamrssi* etc, but iwpriv usurps all
