| ieee80211_superg.c (248127) | ieee80211_superg.c (254082) |
|---|---|
| 1/*- 2 * Copyright (c) 2002-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 --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 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> | 1/*- 2 * Copyright (c) 2002-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 --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 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__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_superg.c 248127 2013-03-10 04:38:06Z adrian $"); | 27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_superg.c 254082 2013-08-08 05:09:35Z adrian $"); |
| 28 29#include "opt_wlan.h" 30 31#ifdef IEEE80211_SUPPORT_SUPERG 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/mbuf.h> --- 470 unchanged lines hidden (view full) --- 506 507 IEEE80211_TX_LOCK_ASSERT(vap->iv_ic); 508 509 /* encap and xmit */ 510 m = ieee80211_encap(vap, ni, m); 511 if (m != NULL) { 512 struct ifnet *ifp = vap->iv_ifp; 513 | 28 29#include "opt_wlan.h" 30 31#ifdef IEEE80211_SUPPORT_SUPERG 32 33#include <sys/param.h> 34#include <sys/systm.h> 35#include <sys/mbuf.h> --- 470 unchanged lines hidden (view full) --- 506 507 IEEE80211_TX_LOCK_ASSERT(vap->iv_ic); 508 509 /* encap and xmit */ 510 m = ieee80211_encap(vap, ni, m); 511 if (m != NULL) { 512 struct ifnet *ifp = vap->iv_ifp; 513 |
| 514 error = ieee80211_parent_transmit(ic, m);; | 514 error = ieee80211_parent_xmitpkt(ic, m);; |
| 515 if (error != 0) { 516 /* NB: IFQ_HANDOFF reclaims mbuf */ 517 ieee80211_free_node(ni); 518 } else { 519 ifp->if_opackets++; 520 } 521 } else 522 ieee80211_free_node(ni); --- 413 unchanged lines hidden --- | 515 if (error != 0) { 516 /* NB: IFQ_HANDOFF reclaims mbuf */ 517 ieee80211_free_node(ni); 518 } else { 519 ifp->if_opackets++; 520 } 521 } else 522 ieee80211_free_node(ni); --- 413 unchanged lines hidden --- |