Deleted Added
full compact
ieee80211_output.c (127772) ieee80211_output.c (132712)
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002, 2003 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:

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

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001 Atsushi Onoe
3 * Copyright (c) 2002, 2003 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:

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

26 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
30 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 127772 2004-04-02 23:25:39Z sam $");
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_output.c 132712 2004-07-27 23:20:45Z rwatson $");
35
36#include "opt_inet.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/mbuf.h>
41#include <sys/malloc.h>
42#include <sys/kernel.h>

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

125 (type & IEEE80211_FC0_SUBTYPE_MASK)
126 >> IEEE80211_FC0_SUBTYPE_SHIFT],
127 ether_sprintf(ni->ni_macaddr),
128 ieee80211_chan2ieee(ic, ni->ni_chan));
129 }
130
131 IF_ENQUEUE(&ic->ic_mgtq, m);
132 ifp->if_timer = 1;
35
36#include "opt_inet.h"
37
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/mbuf.h>
41#include <sys/malloc.h>
42#include <sys/kernel.h>

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

125 (type & IEEE80211_FC0_SUBTYPE_MASK)
126 >> IEEE80211_FC0_SUBTYPE_SHIFT],
127 ether_sprintf(ni->ni_macaddr),
128 ieee80211_chan2ieee(ic, ni->ni_chan));
129 }
130
131 IF_ENQUEUE(&ic->ic_mgtq, m);
132 ifp->if_timer = 1;
133 (*ifp->if_start)(ifp);
133 if_start(ifp);
134 return 0;
135}
136
137/*
138 * Encapsulate an outbound data frame. The mbuf chain is updated and
139 * a reference to the destination node is returned. If an error is
140 * encountered NULL is returned and the node reference will also be NULL.
141 *

--- 432 unchanged lines hidden ---
134 return 0;
135}
136
137/*
138 * Encapsulate an outbound data frame. The mbuf chain is updated and
139 * a reference to the destination node is returned. If an error is
140 * encountered NULL is returned and the node reference will also be NULL.
141 *

--- 432 unchanged lines hidden ---