diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2006-03-07 18:21:11 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2006-03-07 18:21:11 +0000 |
| commit | 8213eec711bdd69c48b62c3a1a9e51bbbdbb6243 (patch) | |
| tree | d0f5e4e4636b7af9cbfa0927f724f1d6af18969b /sys | |
| parent | 2ce3e95e6db16b130b57ebc61555b879559d5ba1 (diff) | |
use the cu_bridge_id rather than the cu_rootid for the bridge address.
From: Onno Molenkamp via Andrew Thompson <thompsa at freebsd dot org>
ok jason@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/bridgestp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 42cc5f88e43..4f567ea3cb8 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.20 2006/03/04 22:40:15 brad Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.21 2006/03/07 18:21:10 brad Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -274,13 +274,13 @@ bstp_send_config_bpdu(bif, cu) bpdu.cbu_rootpathcost = htonl(cu->cu_root_path_cost); - bpdu.cbu_bridgepri = htons(cu->cu_rootid >> 48); - bpdu.cbu_bridgeaddr[0] = cu->cu_rootid >> 40; - bpdu.cbu_bridgeaddr[1] = cu->cu_rootid >> 32; - bpdu.cbu_bridgeaddr[2] = cu->cu_rootid >> 24; - bpdu.cbu_bridgeaddr[3] = cu->cu_rootid >> 16; - bpdu.cbu_bridgeaddr[4] = cu->cu_rootid >> 8; - bpdu.cbu_bridgeaddr[5] = cu->cu_rootid >> 0; + bpdu.cbu_bridgepri = htons(cu->cu_bridge_id >> 48); + bpdu.cbu_bridgeaddr[0] = cu->cu_bridge_id >> 40; + bpdu.cbu_bridgeaddr[1] = cu->cu_bridge_id >> 32; + bpdu.cbu_bridgeaddr[2] = cu->cu_bridge_id >> 24; + bpdu.cbu_bridgeaddr[3] = cu->cu_bridge_id >> 16; + bpdu.cbu_bridgeaddr[4] = cu->cu_bridge_id >> 8; + bpdu.cbu_bridgeaddr[5] = cu->cu_bridge_id >> 0; bpdu.cbu_portid = htons(cu->cu_port_id); bpdu.cbu_messageage = htons(cu->cu_message_age); |