| ieee80211_output.c (190678) | ieee80211_output.c (190850) |
|---|---|
| 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_output.c 190678 2009-04-03 20:46:32Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 190850 2009-04-08 16:19:50Z sam $"); |
| 29 30#include "opt_inet.h" 31#include "opt_wlan.h" 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/mbuf.h> 36#include <sys/kernel.h> --- 211 unchanged lines hidden (view full) --- 248 if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF)) { 249 m = ieee80211_ff_check(ni, m); 250 if (m == NULL) { 251 /* NB: any ni ref held on stageq */ 252 continue; 253 } 254 } 255#endif /* IEEE80211_SUPPORT_SUPERG */ | 29 30#include "opt_inet.h" 31#include "opt_wlan.h" 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/mbuf.h> 36#include <sys/kernel.h> --- 211 unchanged lines hidden (view full) --- 248 if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF)) { 249 m = ieee80211_ff_check(ni, m); 250 if (m == NULL) { 251 /* NB: any ni ref held on stageq */ 252 continue; 253 } 254 } 255#endif /* IEEE80211_SUPPORT_SUPERG */ |
| 256 /* 257 * Encapsulate the packet in prep for transmission. 258 */ 259 m = ieee80211_encap(vap, ni, m); 260 if (m == NULL) { 261 /* NB: stat+msg handled in ieee80211_encap */ 262 ieee80211_free_node(ni); 263 continue; | 256 if (__predict_true((vap->iv_caps & IEEE80211_C_8023ENCAP) == 0)) { 257 /* 258 * Encapsulate the packet in prep for transmission. 259 */ 260 m = ieee80211_encap(vap, ni, m); 261 if (m == NULL) { 262 /* NB: stat+msg handled in ieee80211_encap */ 263 ieee80211_free_node(ni); 264 continue; 265 } |
| 264 } 265 266 /* 267 * Stash the node pointer and hand the frame off to 268 * the underlying device. Note that we do this after 269 * any call to ieee80211_dwds_mcast because that code 270 * uses any existing value for rcvif. 271 */ --- 2525 unchanged lines hidden --- | 266 } 267 268 /* 269 * Stash the node pointer and hand the frame off to 270 * the underlying device. Note that we do this after 271 * any call to ieee80211_dwds_mcast because that code 272 * uses any existing value for rcvif. 273 */ --- 2525 unchanged lines hidden --- |