| ieee80211_input.c (148582) | ieee80211_input.c (148777) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2005 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-2005 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 148582 2005-07-31 06:12:32Z sam $"); | 34__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_input.c 148777 2005-08-06 04:56:49Z sam $"); |
| 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/mbuf.h> 39#include <sys/malloc.h> 40#include <sys/endian.h> 41#include <sys/kernel.h> 42 --- 906 unchanged lines hidden (view full) --- 949 */ 950static void 951ieee80211_send_error(struct ieee80211com *ic, struct ieee80211_node *ni, 952 const u_int8_t *mac, int subtype, int arg) 953{ 954 int istmp; 955 956 if (ni == ic->ic_bss) { | 35 36#include <sys/param.h> 37#include <sys/systm.h> 38#include <sys/mbuf.h> 39#include <sys/malloc.h> 40#include <sys/endian.h> 41#include <sys/kernel.h> 42 --- 906 unchanged lines hidden (view full) --- 949 */ 950static void 951ieee80211_send_error(struct ieee80211com *ic, struct ieee80211_node *ni, 952 const u_int8_t *mac, int subtype, int arg) 953{ 954 int istmp; 955 956 if (ni == ic->ic_bss) { |
| 957 ni = ieee80211_dup_bss(&ic->ic_sta, mac); | 957 ni = ieee80211_tmp_node(ic, mac); |
| 958 if (ni == NULL) { 959 /* XXX msg */ 960 return; 961 } 962 istmp = 1; 963 } else 964 istmp = 0; 965 IEEE80211_SEND_MGMT(ic, ni, subtype, arg); --- 1136 unchanged lines hidden (view full) --- 2102 * XXX Cannot tell if the sender is operating 2103 * in ibss mode. But we need a new node to 2104 * send the response so blindly add them to the 2105 * neighbor table. 2106 */ 2107 ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, 2108 wh->i_addr2); 2109 } else | 958 if (ni == NULL) { 959 /* XXX msg */ 960 return; 961 } 962 istmp = 1; 963 } else 964 istmp = 0; 965 IEEE80211_SEND_MGMT(ic, ni, subtype, arg); --- 1136 unchanged lines hidden (view full) --- 2102 * XXX Cannot tell if the sender is operating 2103 * in ibss mode. But we need a new node to 2104 * send the response so blindly add them to the 2105 * neighbor table. 2106 */ 2107 ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, 2108 wh->i_addr2); 2109 } else |
| 2110 ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); | 2110 ni = ieee80211_tmp_node(ic, wh->i_addr2); |
| 2111 if (ni == NULL) 2112 return; 2113 allocbs = 1; 2114 } else 2115 allocbs = 0; 2116 IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, 2117 "[%s] recv probe req\n", ether_sprintf(wh->i_addr2)); 2118 ni->ni_rssi = rssi; --- 740 unchanged lines hidden --- | 2111 if (ni == NULL) 2112 return; 2113 allocbs = 1; 2114 } else 2115 allocbs = 0; 2116 IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, 2117 "[%s] recv probe req\n", ether_sprintf(wh->i_addr2)); 2118 ni->ni_rssi = rssi; --- 740 unchanged lines hidden --- |