d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not call bstp_stop() internally as it clears the running flag which causes

Browse Source 
the timer to never be restarted.

Reported by:	bz
This commit is contained in:
Andrew Thompson 2006-11-19 23:08:35 +00:00
parent da44960498
commit 36dac7e26d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=164414
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/net/bridgestp.c
View File

@ -146,7 +146,6 @@ static void bstp_edge_delay_expiry(struct bstp_state *,
static int bstp_addr_cmp(const uint8_t *, const uint8_t *);
static int bstp_same_bridgeid(uint64_t, uint64_t);
static void bstp_reinit(struct bstp_state *);
static void bstp_stop_locked(struct bstp_state *);
static void
bstp_transmit(struct bstp_state *bs, struct bstp_port *bp)
@ -1968,7 +1967,7 @@ bstp_reinit(struct bstp_state *bs)
BSTP_LOCK_ASSERT(bs);
if (LIST_EMPTY(&bs->bs_bplist)) {
bstp_stop_locked(bs);
callout_stop(&bs->bs_bstpcallout);
return;
}
@ -2101,24 +2100,17 @@ bstp_init(struct bstp_state *bs)
void
bstp_stop(struct bstp_state *bs)
{
BSTP_LOCK(bs);
bstp_stop_locked(bs);
BSTP_UNLOCK(bs);
}
static void
bstp_stop_locked(struct bstp_state *bs)
{
struct bstp_port *bp;
BSTP_LOCK_ASSERT(bs);
BSTP_LOCK(bs);
LIST_FOREACH(bp, &bs->bs_bplist, bp_next)
bstp_set_port_state(bp, BSTP_IFSTATE_DISCARDING);
bs->bs_running = 0;
callout_stop(&bs->bs_bstpcallout);
BSTP_UNLOCK(bs);
}
int