Attachment 121401 Details for Bug 164369 – file.diff

[patch] file.diff

file.diff (text/plain), 1.02 KB, created by nvass on 2012-01-22 11:30:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nvass

Created: 2012-01-22 11:30:11 UTC

Size: 1.02 KB

patch

obsolete

>Index: sys/net/bridgestp.c
>===================================================================
>--- sys/net/bridgestp.c	(revision 230309)
>+++ sys/net/bridgestp.c	(working copy)
>@@ -2017,20 +2017,27 @@
> 	BSTP_LOCK_ASSERT(bs);
> 
> 	mif = NULL;
>+	bp = LIST_FIRST(&bs->bs_bplist);
> 	/*
> 	 * Search through the Ethernet adapters and find the one with the
>-	 * lowest value. The adapter which we take the MAC address from does
>-	 * not need to be part of the bridge, it just needs to be a unique
>-	 * value.
>+	 * lowest value. Make sure the adapter which we take the MAC address
>+	 * from is part of this bridge, so we can have more than one independent
>+	 * bridges in the same STP domain.
> 	 */
> 	IFNET_RLOCK_NOSLEEP();
> 	TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
> 		if (ifp->if_type != IFT_ETHER)
> 			continue;
> 
>+		if (ifp->if_bridge == NULL || bp == NULL)
>+			continue;
>+
> 		if (bstp_addr_cmp(IF_LLADDR(ifp), llzero) == 0)
> 			continue;
> 
>+		if (ifp->if_bridge != bp->bp_ifp->if_bridge)
>+			continue;
>+
> 		if (mif == NULL) {
> 			mif = ifp;
> 			continue;

Actions: View | Diff

Attachments on bug 164369: 121401 | 121402