| ieee80211_power.c (248069) | ieee80211_power.c (254082) |
|---|---|
| 1/*- 2 * Copyright (c) 2002-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 --- 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-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 --- 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_power.c 248069 2013-03-08 20:23:55Z adrian $"); | 27__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_power.c 254082 2013-08-08 05:09:35Z adrian $"); |
| 28 29/* 30 * IEEE 802.11 power save support. 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> --- 423 unchanged lines hidden (view full) --- 459 /* must be encapsulated */ 460 KASSERT((m->m_flags & M_ENCAP), 461 ("%s: parentq with non-M_ENCAP frame!\n", 462 __func__)); 463 /* 464 * For encaped frames, we need to free the node 465 * reference upon failure. 466 */ | 28 29/* 30 * IEEE 802.11 power save support. 31 */ 32#include "opt_wlan.h" 33 34#include <sys/param.h> 35#include <sys/systm.h> --- 423 unchanged lines hidden (view full) --- 459 /* must be encapsulated */ 460 KASSERT((m->m_flags & M_ENCAP), 461 ("%s: parentq with non-M_ENCAP frame!\n", 462 __func__)); 463 /* 464 * For encaped frames, we need to free the node 465 * reference upon failure. 466 */ |
| 467 if (ieee80211_parent_transmit(ic, m) != 0) | 467 if (ieee80211_parent_xmitpkt(ic, m) != 0) |
| 468 ieee80211_free_node(ni); 469 } 470 } 471 472 /* VAP frames, aren't encapsulated */ 473 if (ifp != NULL) { 474 while (ifp_q != NULL) { 475 m = ifp_q; 476 ifp_q = m->m_nextpkt; 477 KASSERT((!(m->m_flags & M_ENCAP)), 478 ("%s: vapq with M_ENCAP frame!\n", __func__)); | 468 ieee80211_free_node(ni); 469 } 470 } 471 472 /* VAP frames, aren't encapsulated */ 473 if (ifp != NULL) { 474 while (ifp_q != NULL) { 475 m = ifp_q; 476 ifp_q = m->m_nextpkt; 477 KASSERT((!(m->m_flags & M_ENCAP)), 478 ("%s: vapq with M_ENCAP frame!\n", __func__)); |
| 479 (void) ieee80211_vap_transmit(vap, m); | 479 (void) ieee80211_vap_xmitpkt(vap, m); |
| 480 } 481 } 482} 483 484/* 485 * Handle station power-save state change. 486 */ 487void --- 67 unchanged lines hidden --- | 480 } 481 } 482} 483 484/* 485 * Handle station power-save state change. 486 */ 487void --- 67 unchanged lines hidden --- |