Deleted Added
full compact
ieee80211_output.c (289164) ieee80211_output.c (289165)
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 289164 2015-10-12 04:30:38Z adrian $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 289165 2015-10-12 04:55:20Z adrian $");
29
30#include "opt_inet.h"
31#include "opt_inet6.h"
32#include "opt_wlan.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/mbuf.h>

--- 489 unchanged lines hidden (view full) ---

526 * Later on when ic_raw_xmit() has params removed,
527 * they'll have to be added - so fail the transmit if
528 * they can't be.
529 */
530 if (params)
531 (void) ieee80211_add_xmit_params(m, params);
532
533 error = ic->ic_raw_xmit(ni, m, params);
29
30#include "opt_inet.h"
31#include "opt_inet6.h"
32#include "opt_wlan.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/mbuf.h>

--- 489 unchanged lines hidden (view full) ---

526 * Later on when ic_raw_xmit() has params removed,
527 * they'll have to be added - so fail the transmit if
528 * they can't be.
529 */
530 if (params)
531 (void) ieee80211_add_xmit_params(m, params);
532
533 error = ic->ic_raw_xmit(ni, m, params);
534 if (error)
534 if (error) {
535 if_inc_counter(vap->iv_ifp, IFCOUNTER_OERRORS, 1);
535 if_inc_counter(vap->iv_ifp, IFCOUNTER_OERRORS, 1);
536 ieee80211_free_node(ni);
537 }
536 return (error);
537}
538
539/*
540 * 802.11 output routine. This is (currently) used only to
541 * connect bpf write calls to the 802.11 layer for injecting
542 * raw 802.11 frames.
543 */

--- 2947 unchanged lines hidden ---
538 return (error);
539}
540
541/*
542 * 802.11 output routine. This is (currently) used only to
543 * connect bpf write calls to the 802.11 layer for injecting
544 * raw 802.11 frames.
545 */

--- 2947 unchanged lines hidden ---