| ieee80211.c (264843) | ieee80211.c (269778) |
|---|---|
| 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 264843 2014-04-23 22:43:39Z adrian $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211.c 269778 2014-08-10 08:35:42Z 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> --- 528 unchanged lines hidden (view full) --- 565 ieee80211_media_status(ifp, &imr); 566 /* NB: strip explicit mode; we're actually in autoselect */ 567 ifmedia_set(&vap->iv_media, 568 imr.ifm_active &~ (IFM_MMASK | IFM_IEEE80211_TURBO)); 569 if (maxrate) 570 ifp->if_baudrate = IF_Mbps(maxrate); 571 572 ether_ifattach(ifp, vap->iv_myaddr); | 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> --- 528 unchanged lines hidden (view full) --- 565 ieee80211_media_status(ifp, &imr); 566 /* NB: strip explicit mode; we're actually in autoselect */ 567 ifmedia_set(&vap->iv_media, 568 imr.ifm_active &~ (IFM_MMASK | IFM_IEEE80211_TURBO)); 569 if (maxrate) 570 ifp->if_baudrate = IF_Mbps(maxrate); 571 572 ether_ifattach(ifp, vap->iv_myaddr); |
| 573 if (vap->iv_opmode == IEEE80211_M_MONITOR) { 574 /* NB: disallow transmit */ 575 ifp->if_transmit = null_transmit; 576 ifp->if_output = null_output; 577 } else { 578 /* hook output method setup by ether_ifattach */ 579 vap->iv_output = ifp->if_output; 580 ifp->if_output = ieee80211_output; 581 } | 573 /* hook output method setup by ether_ifattach */ 574 vap->iv_output = ifp->if_output; 575 ifp->if_output = ieee80211_output; |
| 582 /* NB: if_mtu set by ether_ifattach to ETHERMTU */ 583 584 IEEE80211_LOCK(ic); 585 TAILQ_INSERT_TAIL(&ic->ic_vaps, vap, iv_next); 586 ieee80211_syncflag_locked(ic, IEEE80211_F_WME); 587#ifdef IEEE80211_SUPPORT_SUPERG 588 ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP); 589#endif --- 1166 unchanged lines hidden --- | 576 /* NB: if_mtu set by ether_ifattach to ETHERMTU */ 577 578 IEEE80211_LOCK(ic); 579 TAILQ_INSERT_TAIL(&ic->ic_vaps, vap, iv_next); 580 ieee80211_syncflag_locked(ic, IEEE80211_F_WME); 581#ifdef IEEE80211_SUPPORT_SUPERG 582 ieee80211_syncflag_locked(ic, IEEE80211_F_TURBOP); 583#endif --- 1166 unchanged lines hidden --- |