| ieee80211_node.c (186659) | ieee80211_node.c (186870) |
|---|---|
| 1/*- 2 * Copyright (c) 2001 Atsushi Onoe 3 * Copyright (c) 2002-2008 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-2008 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_node.c 186659 2008-12-31 21:29:09Z sam $"); | 28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_node.c 186870 2009-01-07 18:17:36Z sam $"); |
| 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/kernel.h> --- 690 unchanged lines hidden (view full) --- 727 ni->ni_capinfo = se->se_capinfo; 728 ni->ni_chan = chan; 729 ni->ni_timoff = se->se_timoff; 730 ni->ni_fhdwell = se->se_fhdwell; 731 ni->ni_fhindex = se->se_fhindex; 732 ni->ni_erp = se->se_erp; 733 IEEE80211_RSSI_LPF(ni->ni_avgrssi, se->se_rssi); 734 ni->ni_noise = se->se_noise; | 29 30#include "opt_wlan.h" 31 32#include <sys/param.h> 33#include <sys/systm.h> 34#include <sys/mbuf.h> 35#include <sys/malloc.h> 36#include <sys/kernel.h> --- 690 unchanged lines hidden (view full) --- 727 ni->ni_capinfo = se->se_capinfo; 728 ni->ni_chan = chan; 729 ni->ni_timoff = se->se_timoff; 730 ni->ni_fhdwell = se->se_fhdwell; 731 ni->ni_fhindex = se->se_fhindex; 732 ni->ni_erp = se->se_erp; 733 IEEE80211_RSSI_LPF(ni->ni_avgrssi, se->se_rssi); 734 ni->ni_noise = se->se_noise; |
| 735 ni->ni_flags |= IEEE80211_NODE_ASSOCID; | 735 if (vap->iv_opmode == IEEE80211_M_STA) { 736 /* NB: only infrastructure mode requires an associd */ 737 ni->ni_flags |= IEEE80211_NODE_ASSOCID; 738 } |
| 736 737 if (ieee80211_ies_init(&ni->ni_ies, se->se_ies.data, se->se_ies.len)) { 738 ieee80211_ies_expand(&ni->ni_ies); 739 if (ni->ni_ies.ath_ie != NULL) 740 ieee80211_parse_ath(ni, ni->ni_ies.ath_ie); 741 if (ni->ni_ies.htcap_ie != NULL) 742 ieee80211_parse_htcap(ni, ni->ni_ies.htcap_ie); 743 if (ni->ni_ies.htinfo_ie != NULL) --- 1831 unchanged lines hidden --- | 739 740 if (ieee80211_ies_init(&ni->ni_ies, se->se_ies.data, se->se_ies.len)) { 741 ieee80211_ies_expand(&ni->ni_ies); 742 if (ni->ni_ies.ath_ie != NULL) 743 ieee80211_parse_ath(ni, ni->ni_ies.ath_ie); 744 if (ni->ni_ies.htcap_ie != NULL) 745 ieee80211_parse_htcap(ni, ni->ni_ies.htcap_ie); 746 if (ni->ni_ies.htinfo_ie != NULL) --- 1831 unchanged lines hidden --- |