| ieee80211.c (257176) | ieee80211.c (264843) |
|---|---|
| 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.c 257176 2013-10-26 17:58:36Z glebius $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 264843 2014-04-23 22:43:39Z adrian $"); |
| 29 30/* 31 * IEEE 802.11 generic handler 32 */ 33#include "opt_wlan.h" 34 35#include <sys/param.h> 36#include <sys/systm.h> --- 1366 unchanged lines hidden (view full) --- 1403 enum ieee80211_phymode mode; 1404 1405 imr->ifm_status = IFM_AVALID; 1406 /* 1407 * NB: use the current channel's mode to lock down a xmit 1408 * rate only when running; otherwise we may have a mismatch 1409 * in which case the rate will not be convertible. 1410 */ | 29 30/* 31 * IEEE 802.11 generic handler 32 */ 33#include "opt_wlan.h" 34 35#include <sys/param.h> 36#include <sys/systm.h> --- 1366 unchanged lines hidden (view full) --- 1403 enum ieee80211_phymode mode; 1404 1405 imr->ifm_status = IFM_AVALID; 1406 /* 1407 * NB: use the current channel's mode to lock down a xmit 1408 * rate only when running; otherwise we may have a mismatch 1409 * in which case the rate will not be convertible. 1410 */ |
| 1411 if (vap->iv_state == IEEE80211_S_RUN) { | 1411 if (vap->iv_state == IEEE80211_S_RUN || 1412 vap->iv_state == IEEE80211_S_SLEEP) { |
| 1412 imr->ifm_status |= IFM_ACTIVE; 1413 mode = ieee80211_chan2mode(ic->ic_curchan); 1414 } else 1415 mode = IEEE80211_MODE_AUTO; 1416 imr->ifm_active = media_status(vap->iv_opmode, ic->ic_curchan); 1417 /* 1418 * Calculate a current rate if possible. 1419 */ --- 335 unchanged lines hidden --- | 1413 imr->ifm_status |= IFM_ACTIVE; 1414 mode = ieee80211_chan2mode(ic->ic_curchan); 1415 } else 1416 mode = IEEE80211_MODE_AUTO; 1417 imr->ifm_active = media_status(vap->iv_opmode, ic->ic_curchan); 1418 /* 1419 * Calculate a current rate if possible. 1420 */ --- 335 unchanged lines hidden --- |