Deleted Added
full compact
ieee80211_mesh.c (302408) ieee80211_mesh.c (322060)
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: stable/11/sys/net80211/ieee80211_mesh.c 300232 2016-05-19 21:08:33Z avos $");
31__FBSDID("$FreeBSD: stable/11/sys/net80211/ieee80211_mesh.c 322060 2017-08-04 20:22:43Z pfg $");
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"

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

2625 rt_gate->rt_flags |= IEEE80211_MESHRT_FLAGS_GATE;
2626 }
2627
2628 MESH_RT_UNLOCK(ms);
2629
2630 /* popagate only if decremented ttl >= 1 && forwarding is enabled */
2631 if ((ie.gann_ttl - 1) < 1 && !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD))
2632 return 0;
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"

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

2625 rt_gate->rt_flags |= IEEE80211_MESHRT_FLAGS_GATE;
2626 }
2627
2628 MESH_RT_UNLOCK(ms);
2629
2630 /* popagate only if decremented ttl >= 1 && forwarding is enabled */
2631 if ((ie.gann_ttl - 1) < 1 && !(ms->ms_flags & IEEE80211_MESHFLAGS_FWD))
2632 return 0;
2633 pgann.gann_flags = ie.gann_flags; /* Reserved */
2633 pgann.gann_flags = ie.gann_flags; /* Reserved */
2634 pgann.gann_hopcount = ie.gann_hopcount + 1;
2635 pgann.gann_ttl = ie.gann_ttl - 1;
2636 IEEE80211_ADDR_COPY(pgann.gann_addr, ie.gann_addr);
2637 pgann.gann_seq = ie.gann_seq;
2638 pgann.gann_interval = ie.gann_interval;
2639
2640 IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ie.gann_addr,
2641 "%s", "propagate GANN");

--- 970 unchanged lines hidden ---
2634 pgann.gann_hopcount = ie.gann_hopcount + 1;
2635 pgann.gann_ttl = ie.gann_ttl - 1;
2636 IEEE80211_ADDR_COPY(pgann.gann_addr, ie.gann_addr);
2637 pgann.gann_seq = ie.gann_seq;
2638 pgann.gann_interval = ie.gann_interval;
2639
2640 IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_MESH, ie.gann_addr,
2641 "%s", "propagate GANN");

--- 970 unchanged lines hidden ---