Deleted Added
sdiff udiff text old ( 117811 ) new ( 117817 )
full compact
ieee80211_input.c (117811) ieee80211_input.c (117817)
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_input.c 117811 2003-07-20 21:36:08Z sam $");
34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 117817 2003-07-21 02:49:42Z sam $");
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>

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

133 * NB: Node allocation is handled in the
134 * management handling routines. Just fake
135 * up a reference to the hosts's node to do
136 * the stuff below.
137 */
138 ni = ieee80211_ref_node(ic->ic_bss);
139 }
140 break;
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>

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

133 * NB: Node allocation is handled in the
134 * management handling routines. Just fake
135 * up a reference to the hosts's node to do
136 * the stuff below.
137 */
138 ni = ieee80211_ref_node(ic->ic_bss);
139 }
140 break;
141 case IEEE80211_M_MONITOR:
142 /* NB: this should collect everything */
143 goto out;
141 default:
142 /* XXX catch bad values */
143 break;
144 }
145 ni->ni_rssi = rssi;
146 ni->ni_rstamp = rstamp;
147 ni->ni_rantenna = rantenna;
148 rxseq = ni->ni_rxseq;

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

207 IEEE80211_SEND_MGMT(ic, ni,
208 IEEE80211_FC0_SUBTYPE_DISASSOC,
209 IEEE80211_REASON_NOT_ASSOCED);
210 ieee80211_unref_node(&ni);
211 goto err;
212 }
213 ieee80211_unref_node(&ni);
214 break;
144 default:
145 /* XXX catch bad values */
146 break;
147 }
148 ni->ni_rssi = rssi;
149 ni->ni_rstamp = rstamp;
150 ni->ni_rantenna = rantenna;
151 rxseq = ni->ni_rxseq;

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

210 IEEE80211_SEND_MGMT(ic, ni,
211 IEEE80211_FC0_SUBTYPE_DISASSOC,
212 IEEE80211_REASON_NOT_ASSOCED);
213 ieee80211_unref_node(&ni);
214 goto err;
215 }
216 ieee80211_unref_node(&ni);
217 break;
218 case IEEE80211_M_MONITOR:
219 break;
215 }
216 if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
217 if (ic->ic_flags & IEEE80211_F_WEPON) {
218 m = ieee80211_wep_crypt(ifp, m, 0);
219 if (m == NULL)
220 goto err;
221 wh = mtod(m, struct ieee80211_frame *);
222 } else

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

824 ni->ni_fails++;
825 ieee80211_unref_node(&ni);
826 }
827 return;
828 }
829 ieee80211_new_state(ic, IEEE80211_S_ASSOC,
830 wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
831 break;
220 }
221 if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
222 if (ic->ic_flags & IEEE80211_F_WEPON) {
223 m = ieee80211_wep_crypt(ifp, m, 0);
224 if (m == NULL)
225 goto err;
226 wh = mtod(m, struct ieee80211_frame *);
227 } else

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

829 ni->ni_fails++;
830 ieee80211_unref_node(&ni);
831 }
832 return;
833 }
834 ieee80211_new_state(ic, IEEE80211_S_ASSOC,
835 wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_MASK);
836 break;
837 case IEEE80211_M_MONITOR:
838 break;
832 }
833 break;
834 }
835
836 case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
837 case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: {
838 u_int16_t capinfo, bintval;
839

--- 250 unchanged lines hidden --- 		839 }
840 break;
841 }
842
843 case IEEE80211_FC0_SUBTYPE_ASSOC_REQ:
844 case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: {
845 u_int16_t capinfo, bintval;
846

--- 250 unchanged lines hidden ---