| ieee80211_mesh.c (281383) | ieee80211_mesh.c (282742) |
|---|---|
| 1/*- 2 * Copyright (c) 2009 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Rui Paulo under sponsorship from the 6 * FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29#include <sys/cdefs.h> 30#ifdef __FreeBSD__ | 1/*- 2 * Copyright (c) 2009 The FreeBSD Foundation 3 * All rights reserved. 4 * 5 * This software was developed by Rui Paulo under sponsorship from the 6 * FreeBSD Foundation. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 14 unchanged lines hidden (view full) --- 23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 27 * SUCH DAMAGE. 28 */ 29#include <sys/cdefs.h> 30#ifdef __FreeBSD__ |
| 31__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_mesh.c 281383 2015-04-10 20:55:17Z eadler $"); | 31__FBSDID("$FreeBSD: head/sys/net80211/ieee80211_mesh.c 282742 2015-05-10 22:07:53Z adrian $"); |
| 32#endif 33 34/* 35 * IEEE 802.11s Mesh Point (MBSS) support. 36 * 37 * Based on March 2009, D3.0 802.11s draft spec. 38 */ 39#include "opt_inet.h" --- 1861 unchanged lines hidden (view full) --- 1901 * is 802.11 traffic present. 1902 * 1903 * XXX check if the beacon we recv'd gives 1904 * us what we need and suppress the probe req 1905 */ 1906 ieee80211_probe_curchan(vap, 1); 1907 ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN; 1908 } | 32#endif 33 34/* 35 * IEEE 802.11s Mesh Point (MBSS) support. 36 * 37 * Based on March 2009, D3.0 802.11s draft spec. 38 */ 39#include "opt_inet.h" --- 1861 unchanged lines hidden (view full) --- 1901 * is 802.11 traffic present. 1902 * 1903 * XXX check if the beacon we recv'd gives 1904 * us what we need and suppress the probe req 1905 */ 1906 ieee80211_probe_curchan(vap, 1); 1907 ic->ic_flags_ext &= ~IEEE80211_FEXT_PROBECHAN; 1908 } |
| 1909 ieee80211_add_scan(vap, &scan, wh, | 1909 ieee80211_add_scan(vap, ic->ic_curchan, &scan, wh, |
| 1910 subtype, rssi, nf); 1911 return; 1912 } 1913 1914 /* The rest of this code assumes we are running */ 1915 if (vap->iv_state != IEEE80211_S_RUN) 1916 return; 1917 /* --- 1719 unchanged lines hidden --- | 1910 subtype, rssi, nf); 1911 return; 1912 } 1913 1914 /* The rest of this code assumes we are running */ 1915 if (vap->iv_state != IEEE80211_S_RUN) 1916 return; 1917 /* --- 1719 unchanged lines hidden --- |