Deleted Added
full compact
bridgestp.h (160703) bridgestp.h (160867)
1/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
2
3/*
4 * Copyright 2001 Wasabi Systems, Inc.
5 * All rights reserved.
6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 *

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

62 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
63 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
64 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
65 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
66 * POSSIBILITY OF SUCH DAMAGE.
67 *
68 * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
69 *
1/* $NetBSD: if_bridgevar.h,v 1.4 2003/07/08 07:13:50 itojun Exp $ */
2
3/*
4 * Copyright 2001 Wasabi Systems, Inc.
5 * All rights reserved.
6 *
7 * Written by Jason R. Thorpe for Wasabi Systems, Inc.
8 *

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

62 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
63 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
64 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
65 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
66 * POSSIBILITY OF SUCH DAMAGE.
67 *
68 * OpenBSD: if_bridge.h,v 1.14 2001/03/22 03:48:29 jason Exp
69 *
70 * $FreeBSD: head/sys/net/bridgestp.h 160703 2006-07-26 10:43:02Z thompsa $
70 * $FreeBSD: head/sys/net/bridgestp.h 160867 2006-07-31 20:24:46Z thompsa $
71 */
72
73/*
74 * Data structure and control definitions for STP interfaces.
75 */
76
77#include <sys/callout.h>
78#include <sys/queue.h>

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

196 struct bstp_config_unit bp_config_bpdu;
197 uint16_t bp_port_id;
198 uint16_t bp_designated_port;
199 uint8_t bp_state;
200 uint8_t bp_topology_change_acknowledge;
201 uint8_t bp_config_pending;
202 uint8_t bp_change_detection_enabled;
203 uint8_t bp_priority;
71 */
72
73/*
74 * Data structure and control definitions for STP interfaces.
75 */
76
77#include <sys/callout.h>
78#include <sys/queue.h>

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

196 struct bstp_config_unit bp_config_bpdu;
197 uint16_t bp_port_id;
198 uint16_t bp_designated_port;
199 uint8_t bp_state;
200 uint8_t bp_topology_change_acknowledge;
201 uint8_t bp_config_pending;
202 uint8_t bp_change_detection_enabled;
203 uint8_t bp_priority;
204 uint32_t bp_forward_transitions;
204};
205
206/*
207 * Software state for each bridge STP.
208 */
209struct bstp_state {
210 LIST_ENTRY(bstp_state) bs_list;
211 struct mtx bs_mtx;

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

224 uint16_t bs_bridge_priority;
225 uint8_t bs_topology_change_detected;
226 uint8_t bs_topology_change;
227 struct bstp_timer bs_hello_timer;
228 struct bstp_timer bs_topology_change_timer;
229 struct bstp_timer bs_tcn_timer;
230 struct callout bs_bstpcallout; /* STP callout */
231 struct bstp_timer bs_link_timer;
205};
206
207/*
208 * Software state for each bridge STP.
209 */
210struct bstp_state {
211 LIST_ENTRY(bstp_state) bs_list;
212 struct mtx bs_mtx;

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

225 uint16_t bs_bridge_priority;
226 uint8_t bs_topology_change_detected;
227 uint8_t bs_topology_change;
228 struct bstp_timer bs_hello_timer;
229 struct bstp_timer bs_topology_change_timer;
230 struct bstp_timer bs_tcn_timer;
231 struct callout bs_bstpcallout; /* STP callout */
232 struct bstp_timer bs_link_timer;
233 struct timeval bs_last_tc_time;
232 LIST_HEAD(, bstp_port) bs_bplist;
233};
234
235#define BSTP_LOCK_INIT(_bs) mtx_init(&(_bs)->bs_mtx, "bstp", \
236 NULL, MTX_DEF)
237#define BSTP_LOCK_DESTROY(_bs) mtx_destroy(&(_bs)->bs_mtx)
238#define BSTP_LOCK(_bs) mtx_lock(&(_bs)->bs_mtx)
239#define BSTP_UNLOCK(_bs) mtx_unlock(&(_bs)->bs_mtx)

--- 17 unchanged lines hidden ---
234 LIST_HEAD(, bstp_port) bs_bplist;
235};
236
237#define BSTP_LOCK_INIT(_bs) mtx_init(&(_bs)->bs_mtx, "bstp", \
238 NULL, MTX_DEF)
239#define BSTP_LOCK_DESTROY(_bs) mtx_destroy(&(_bs)->bs_mtx)
240#define BSTP_LOCK(_bs) mtx_lock(&(_bs)->bs_mtx)
241#define BSTP_UNLOCK(_bs) mtx_unlock(&(_bs)->bs_mtx)

--- 17 unchanged lines hidden ---