| ieee80211_ioctl.c (193655) | ieee80211_ioctl.c (194021) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2009 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: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2009 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: --- 11 unchanged lines hidden (view full) --- 20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 */ 26 27#include <sys/cdefs.h> |
| 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 193655 2009-06-07 22:00:22Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_ioctl.c 194021 2009-06-11 17:09:39Z sam $"); |
| 29 30/* 31 * IEEE 802.11 ioctl support (FreeBSD-specific) 32 */ 33 34#include "opt_inet.h" 35#include "opt_ipx.h" 36#include "opt_wlan.h" --- 361 unchanged lines hidden (view full) --- 398 if (si->isi_nrates > 15) 399 si->isi_nrates = 15; 400 memcpy(si->isi_rates, ni->ni_rates.rs_rates, si->isi_nrates); 401 si->isi_txrate = ni->ni_txrate; 402 if (si->isi_txrate & IEEE80211_RATE_MCS) { 403 const struct ieee80211_mcs_rates *mcs = 404 &ieee80211_htrates[ni->ni_txrate &~ IEEE80211_RATE_MCS]; 405 if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { | 29 30/* 31 * IEEE 802.11 ioctl support (FreeBSD-specific) 32 */ 33 34#include "opt_inet.h" 35#include "opt_ipx.h" 36#include "opt_wlan.h" --- 361 unchanged lines hidden (view full) --- 398 if (si->isi_nrates > 15) 399 si->isi_nrates = 15; 400 memcpy(si->isi_rates, ni->ni_rates.rs_rates, si->isi_nrates); 401 si->isi_txrate = ni->ni_txrate; 402 if (si->isi_txrate & IEEE80211_RATE_MCS) { 403 const struct ieee80211_mcs_rates *mcs = 404 &ieee80211_htrates[ni->ni_txrate &~ IEEE80211_RATE_MCS]; 405 if (IEEE80211_IS_CHAN_HT40(ni->ni_chan)) { |
| 406 if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI40) | 406 if (ni->ni_flags & IEEE80211_NODE_SGI40) |
| 407 si->isi_txmbps = mcs->ht40_rate_800ns; 408 else 409 si->isi_txmbps = mcs->ht40_rate_400ns; 410 } else { | 407 si->isi_txmbps = mcs->ht40_rate_800ns; 408 else 409 si->isi_txmbps = mcs->ht40_rate_400ns; 410 } else { |
| 411 if (ni->ni_htcap & IEEE80211_HTCAP_SHORTGI20) | 411 if (ni->ni_flags & IEEE80211_NODE_SGI20) |
| 412 si->isi_txmbps = mcs->ht20_rate_800ns; 413 else 414 si->isi_txmbps = mcs->ht20_rate_400ns; 415 } 416 } else 417 si->isi_txmbps = si->isi_txrate; 418 si->isi_associd = ni->ni_associd; 419 si->isi_txpower = ni->ni_txpower; --- 2910 unchanged lines hidden --- | 412 si->isi_txmbps = mcs->ht20_rate_800ns; 413 else 414 si->isi_txmbps = mcs->ht20_rate_400ns; 415 } 416 } else 417 si->isi_txmbps = si->isi_txrate; 418 si->isi_associd = ni->ni_associd; 419 si->isi_txpower = ni->ni_txpower; --- 2910 unchanged lines hidden --- |