| ieee80211_mesh.c (253745) | ieee80211_mesh.c (254082) |
|---|---|
| 1/*- 2 * Copyright (c) 2009 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Rui Paulo under sponsorship from the 6 * FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29#include <sys/cdefs.h> 30#ifdef __FreeBSD__ | 1/*- 2 * Copyright (c) 2009 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Rui Paulo under sponsorship from the 6 * FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29#include <sys/cdefs.h> 30#ifdef __FreeBSD__ |
| 31__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_mesh.c 253745 2013-07-28 17:35:19Z adrian $"); | 31__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_mesh.c 254082 2013-08-08 05:09:35Z adrian $"); |
| 32#endif 33 34/* 35 * IEEE 802.11s Mesh Point (MBSS) support. 36 * 37 * Based on March 2009, D3.0 802.11s draft spec. 38 */ 39#include "opt_inet.h" --- 1198 unchanged lines hidden (view full) --- 1238 * 1239 * Because of this, there's no TX lock being held as there's no 1240 * encaps state being used. 1241 * 1242 * Doing a direct parent transmit may not be the correct thing 1243 * to do here; we'll have to re-think this soon. 1244 */ 1245 IEEE80211_TX_LOCK(ic); | 32#endif 33 34/* 35 * IEEE 802.11s Mesh Point (MBSS) support. 36 * 37 * Based on March 2009, D3.0 802.11s draft spec. 38 */ 39#include "opt_inet.h" --- 1198 unchanged lines hidden (view full) --- 1238 * 1239 * Because of this, there's no TX lock being held as there's no 1240 * encaps state being used. 1241 * 1242 * Doing a direct parent transmit may not be the correct thing 1243 * to do here; we'll have to re-think this soon. 1244 */ 1245 IEEE80211_TX_LOCK(ic); |
| 1246 err = ieee80211_parent_transmit(ic, mcopy); | 1246 err = ieee80211_parent_xmitpkt(ic, mcopy); |
| 1247 IEEE80211_TX_UNLOCK(ic); 1248 if (err != 0) { 1249 /* NB: IFQ_HANDOFF reclaims mbuf */ 1250 ieee80211_free_node(ni); 1251 } else { 1252 ifp->if_opackets++; 1253 } 1254} --- 2380 unchanged lines hidden --- | 1247 IEEE80211_TX_UNLOCK(ic); 1248 if (err != 0) { 1249 /* NB: IFQ_HANDOFF reclaims mbuf */ 1250 ieee80211_free_node(ni); 1251 } else { 1252 ifp->if_opackets++; 1253 } 1254} --- 2380 unchanged lines hidden --- |