| ieee80211_adhoc.c (244061) | ieee80211_adhoc.c (244078) |
|---|---|
| 1/*- 2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> 27#ifdef __FreeBSD__ | 1/*- 2 * Copyright (c) 2007-2009 Sam Leffler, Errno Consulting 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 11 unchanged lines hidden (view full) --- 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include <sys/cdefs.h> 27#ifdef __FreeBSD__ |
| 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_adhoc.c 244061 2012-12-09 23:56:29Z adrian $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_adhoc.c 244078 2012-12-10 07:00:46Z adrian $"); |
| 29#endif 30 31/* 32 * IEEE 802.11 IBSS mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 129 unchanged lines hidden (view full) --- 166 /* fall thru... */ 167 case IEEE80211_S_INIT: 168 if (vap->iv_des_chan != IEEE80211_CHAN_ANYC && 169 !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) { 170 /* 171 * Already have a channel; bypass the 172 * scan and startup immediately. 173 */ | 29#endif 30 31/* 32 * IEEE 802.11 IBSS mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 129 unchanged lines hidden (view full) --- 166 /* fall thru... */ 167 case IEEE80211_S_INIT: 168 if (vap->iv_des_chan != IEEE80211_CHAN_ANYC && 169 !IEEE80211_IS_CHAN_RADAR(vap->iv_des_chan)) { 170 /* 171 * Already have a channel; bypass the 172 * scan and startup immediately. 173 */ |
| 174 ieee80211_create_ibss(vap, vap->iv_des_chan); | 174 ieee80211_create_ibss(vap, 175 ieee80211_ht_adjust_channel(ic, 176 vap->iv_des_chan, vap->iv_flags_ht)); |
| 175 break; 176 } 177 /* 178 * Initiate a scan. We can come here as a result 179 * of an IEEE80211_IOC_SCAN_REQ too in which case 180 * the vap will be marked with IEEE80211_FEXT_SCANREQ 181 * and the scan request parameters will be present 182 * in iv_scanreq. Otherwise we do the default. --- 738 unchanged lines hidden --- | 177 break; 178 } 179 /* 180 * Initiate a scan. We can come here as a result 181 * of an IEEE80211_IOC_SCAN_REQ too in which case 182 * the vap will be marked with IEEE80211_FEXT_SCANREQ 183 * and the scan request parameters will be present 184 * in iv_scanreq. Otherwise we do the default. --- 738 unchanged lines hidden --- |