Deleted Added
full compact
ieee80211_sta.c (203422) ieee80211_sta.c (205140)
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
1/*-
2 * Copyright (c) 2007-2008 Sam Leffler, Errno Consulting
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25
26#include <sys/cdefs.h>
27#ifdef __FreeBSD__
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 203422 2010-02-03 10:07:43Z rpaulo $");
28__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_sta.c 205140 2010-03-14 01:57:32Z weongyo $");
29#endif
30
31/*
32 * IEEE 802.11 Station mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

136 * so this avoids the expensive scan if the ap is
137 * still there.
138 */
139 ieee80211_send_probereq(vap->iv_bss, vap->iv_myaddr,
140 vap->iv_bss->ni_bssid, vap->iv_bss->ni_bssid,
141 vap->iv_bss->ni_essid, vap->iv_bss->ni_esslen);
142 return;
143 }
29#endif
30
31/*
32 * IEEE 802.11 Station mode support.
33 */
34#include "opt_inet.h"
35#include "opt_wlan.h"
36

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

136 * so this avoids the expensive scan if the ap is
137 * still there.
138 */
139 ieee80211_send_probereq(vap->iv_bss, vap->iv_myaddr,
140 vap->iv_bss->ni_bssid, vap->iv_bss->ni_bssid,
141 vap->iv_bss->ni_essid, vap->iv_bss->ni_esslen);
142 return;
143 }
144
145 callout_stop(&vap->iv_swbmiss);
144 vap->iv_bmiss_count = 0;
145 vap->iv_stats.is_beacon_miss++;
146 if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) {
147#ifdef IEEE80211_SUPPORT_SUPERG
148 struct ieee80211com *ic = vap->iv_ic;
149
150 /*
151 * If we receive a beacon miss interrupt when using

--- 1591 unchanged lines hidden ---
146 vap->iv_bmiss_count = 0;
147 vap->iv_stats.is_beacon_miss++;
148 if (vap->iv_roaming == IEEE80211_ROAMING_AUTO) {
149#ifdef IEEE80211_SUPPORT_SUPERG
150 struct ieee80211com *ic = vap->iv_ic;
151
152 /*
153 * If we receive a beacon miss interrupt when using

--- 1591 unchanged lines hidden ---