| ieee80211_adhoc.c (221418) | ieee80211_adhoc.c (241138) |
|---|---|
| 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 221418 2011-05-04 02:23:59Z adrian $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_adhoc.c 241138 2012-10-02 17:45:19Z adrian $"); |
| 29#endif 30 31/* 32 * IEEE 802.11 IBSS mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 200 unchanged lines hidden (view full) --- 237 /* 238 * Fake association when joining an existing bss. 239 */ 240 if (!IEEE80211_ADDR_EQ(ni->ni_macaddr, vap->iv_myaddr) && 241 ic->ic_newassoc != NULL) 242 ic->ic_newassoc(ni, ostate != IEEE80211_S_RUN); 243 break; 244 case IEEE80211_S_SLEEP: | 29#endif 30 31/* 32 * IEEE 802.11 IBSS mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 200 unchanged lines hidden (view full) --- 237 /* 238 * Fake association when joining an existing bss. 239 */ 240 if (!IEEE80211_ADDR_EQ(ni->ni_macaddr, vap->iv_myaddr) && 241 ic->ic_newassoc != NULL) 242 ic->ic_newassoc(ni, ostate != IEEE80211_S_RUN); 243 break; 244 case IEEE80211_S_SLEEP: |
| 245 ieee80211_sta_pwrsave(vap, 0); | 245 vap->iv_sta_ps(vap, 0); |
| 246 break; 247 default: 248 invalid: 249 IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, 250 "%s: unexpected state transition %s -> %s\n", __func__, 251 ieee80211_state_name[ostate], ieee80211_state_name[nstate]); 252 break; 253 } --- 666 unchanged lines hidden --- | 246 break; 247 default: 248 invalid: 249 IEEE80211_DPRINTF(vap, IEEE80211_MSG_STATE, 250 "%s: unexpected state transition %s -> %s\n", __func__, 251 ieee80211_state_name[ostate], ieee80211_state_name[nstate]); 252 break; 253 } --- 666 unchanged lines hidden --- |