| ieee80211_node.c (190579) | ieee80211_node.c (191015) |
|---|---|
| 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_node.c 190579 2009-03-30 21:53:27Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 191015 2009-04-13 20:45:29Z sam $"); |
| 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/kernel.h> --- 195 unchanged lines hidden (view full) --- 232 enum ieee80211_phymode mode; 233 234 if (ni->ni_flags & IEEE80211_NODE_HT) { 235 if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) 236 mode = IEEE80211_MODE_11NA; 237 else 238 mode = IEEE80211_MODE_11NG; 239 } else { /* legacy rate handling */ | 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/kernel.h> --- 195 unchanged lines hidden (view full) --- 232 enum ieee80211_phymode mode; 233 234 if (ni->ni_flags & IEEE80211_NODE_HT) { 235 if (IEEE80211_IS_CHAN_5GHZ(ni->ni_chan)) 236 mode = IEEE80211_MODE_11NA; 237 else 238 mode = IEEE80211_MODE_11NG; 239 } else { /* legacy rate handling */ |
| 240 /* NB: 108A/108G should be handled as 11a/11g respectively */ | |
| 241 if (IEEE80211_IS_CHAN_ST(ni->ni_chan)) 242 mode = IEEE80211_MODE_STURBO_A; 243 else if (IEEE80211_IS_CHAN_HALF(ni->ni_chan)) 244 mode = IEEE80211_MODE_HALF; 245 else if (IEEE80211_IS_CHAN_QUARTER(ni->ni_chan)) 246 mode = IEEE80211_MODE_QUARTER; | 240 if (IEEE80211_IS_CHAN_ST(ni->ni_chan)) 241 mode = IEEE80211_MODE_STURBO_A; 242 else if (IEEE80211_IS_CHAN_HALF(ni->ni_chan)) 243 mode = IEEE80211_MODE_HALF; 244 else if (IEEE80211_IS_CHAN_QUARTER(ni->ni_chan)) 245 mode = IEEE80211_MODE_QUARTER; |
| 246 /* NB: 108A should be handled as 11a */ |
|
| 247 else if (IEEE80211_IS_CHAN_A(ni->ni_chan)) 248 mode = IEEE80211_MODE_11A; | 247 else if (IEEE80211_IS_CHAN_A(ni->ni_chan)) 248 mode = IEEE80211_MODE_11A; |
| 249 else if (ni->ni_flags & IEEE80211_NODE_ERP) | 249 else if (IEEE80211_IS_CHAN_108G(ni->ni_chan) || 250 (ni->ni_flags & IEEE80211_NODE_ERP)) |
| 250 mode = IEEE80211_MODE_11G; 251 else 252 mode = IEEE80211_MODE_11B; 253 } 254 ni->ni_txparms = &vap->iv_txparms[mode]; 255} 256 257/* --- 2307 unchanged lines hidden --- | 251 mode = IEEE80211_MODE_11G; 252 else 253 mode = IEEE80211_MODE_11B; 254 } 255 ni->ni_txparms = &vap->iv_txparms[mode]; 256} 257 258/* --- 2307 unchanged lines hidden --- |