| ieee80211_hostap.c (248069) | ieee80211_hostap.c (254082) |
|---|---|
| 1/*- 2 * Copyright (c) 2007-2008 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-2008 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_hostap.c 248069 2013-03-08 20:23:55Z adrian $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_hostap.c 254082 2013-08-08 05:09:35Z adrian $"); |
| 29#endif 30 31/* 32 * IEEE 802.11 HOSTAP mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 370 unchanged lines hidden (view full) --- 407 IEEE80211_NODE_STAT(sta, rx_unauth); 408 } 409 ieee80211_free_node(sta); 410 } 411 } 412 if (mcopy != NULL) { 413 int len, err; 414 len = mcopy->m_pkthdr.len; | 29#endif 30 31/* 32 * IEEE 802.11 HOSTAP mode support. 33 */ 34#include "opt_inet.h" 35#include "opt_wlan.h" 36 --- 370 unchanged lines hidden (view full) --- 407 IEEE80211_NODE_STAT(sta, rx_unauth); 408 } 409 ieee80211_free_node(sta); 410 } 411 } 412 if (mcopy != NULL) { 413 int len, err; 414 len = mcopy->m_pkthdr.len; |
| 415 err = ieee80211_vap_transmit(vap, mcopy); | 415 err = ieee80211_vap_xmitpkt(vap, mcopy); |
| 416 if (err) { 417 /* NB: IFQ_HANDOFF reclaims mcopy */ 418 } else { 419 ifp->if_opackets++; 420 } 421 } 422 } 423 if (m != NULL) { --- 1893 unchanged lines hidden (view full) --- 2317 "%s", "recv ps-poll, send packet, queue empty"); 2318 if (vap->iv_set_tim != NULL) 2319 vap->iv_set_tim(ni, 0); 2320 } 2321 m->m_flags |= M_PWR_SAV; /* bypass PS handling */ 2322 2323 /* 2324 * Do the right thing; if it's an encap'ed frame then | 416 if (err) { 417 /* NB: IFQ_HANDOFF reclaims mcopy */ 418 } else { 419 ifp->if_opackets++; 420 } 421 } 422 } 423 if (m != NULL) { --- 1893 unchanged lines hidden (view full) --- 2317 "%s", "recv ps-poll, send packet, queue empty"); 2318 if (vap->iv_set_tim != NULL) 2319 vap->iv_set_tim(ni, 0); 2320 } 2321 m->m_flags |= M_PWR_SAV; /* bypass PS handling */ 2322 2323 /* 2324 * Do the right thing; if it's an encap'ed frame then |
| 2325 * call ieee80211_parent_transmit() (and free the ref) else 2326 * call ieee80211_vap_transmit(). | 2325 * call ieee80211_parent_xmitpkt() (and free the ref) else 2326 * call ieee80211_vap_xmitpkt(). |
| 2327 */ 2328 if (m->m_flags & M_ENCAP) { | 2327 */ 2328 if (m->m_flags & M_ENCAP) { |
| 2329 if (ieee80211_parent_transmit(ic, m) != 0) | 2329 if (ieee80211_parent_xmitpkt(ic, m) != 0) |
| 2330 ieee80211_free_node(ni); 2331 } else { | 2330 ieee80211_free_node(ni); 2331 } else { |
| 2332 (void) ieee80211_vap_transmit(vap, m); | 2332 (void) ieee80211_vap_xmitpkt(vap, m); |
| 2333 } 2334} | 2333 } 2334} |