From c72a9dc1836eb2287a144535d3a139ebd2955ca7 Mon Sep 17 00:00:00 2001
From: Martin Pieuchot <mpi@cvs.openbsd.org>
Date: Mon, 22 Oct 2018 13:18:24 +0000
Subject: Rename 'bridge_iflist' variables for coherency, missed in previous.

---
 sys/net/bridgectl.c | 22 +++++++++++-----------
 sys/net/bridgestp.c | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'sys/net')

diff --git a/sys/net/bridgectl.c b/sys/net/bridgectl.c
index e0c3f052359..10de7dbd0c0 100644
--- a/sys/net/bridgectl.c
+++ b/sys/net/bridgectl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bridgectl.c,v 1.9 2018/09/27 12:39:36 mpi Exp $	*/
+/*	$OpenBSD: bridgectl.c,v 1.10 2018/10/22 13:18:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -66,7 +66,7 @@ bridgectl_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct ifbrlreq *brlreq = (struct ifbrlreq *)data;
 	struct ifbareq *bareq = (struct ifbareq *)data;
 	struct ifbrparam *bparam = (struct ifbrparam *)data;
-	struct bridge_iflist *p;
+	struct bridge_iflist *bif;
 	struct ifnet *ifs;
 	int error = 0;
 
@@ -83,8 +83,8 @@ bridgectl_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			error = ENOENT;
 			break;
 		}
-		p = (struct bridge_iflist *)ifs->if_bridgeport;
-		if (p == NULL || p->bridge_sc != sc) {
+		bif = (struct bridge_iflist *)ifs->if_bridgeport;
+		if (bif == NULL || bif->bridge_sc != sc) {
 			error = ESRCH;
 			break;
 		}
@@ -124,8 +124,8 @@ bridgectl_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			error = ENOENT;
 			break;
 		}
-		p = (struct bridge_iflist *)ifs->if_bridgeport;
-		if (p == NULL || p->bridge_sc != sc) {
+		bif = (struct bridge_iflist *)ifs->if_bridgeport;
+		if (bif == NULL || bif->bridge_sc != sc) {
 			error = ESRCH;
 			break;
 		}
@@ -136,12 +136,12 @@ bridgectl_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			break;
 		}
 		if (brlreq->ifbr_flags & BRL_FLAG_IN) {
-			error = bridge_addrule(p, brlreq, 0);
+			error = bridge_addrule(bif, brlreq, 0);
 			if (error)
 				break;
 		}
 		if (brlreq->ifbr_flags & BRL_FLAG_OUT) {
-			error = bridge_addrule(p, brlreq, 1);
+			error = bridge_addrule(bif, brlreq, 1);
 			if (error)
 				break;
 		}
@@ -152,12 +152,12 @@ bridgectl_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			error = ENOENT;
 			break;
 		}
-		p = (struct bridge_iflist *)ifs->if_bridgeport;
-		if (p == NULL || p->bridge_sc != sc) {
+		bif = (struct bridge_iflist *)ifs->if_bridgeport;
+		if (bif == NULL || bif->bridge_sc != sc) {
 			error = ESRCH;
 			break;
 		}
-		bridge_flushrule(p);
+		bridge_flushrule(bif);
 		break;
 	case SIOCBRDGGRL:
 		error = bridge_brlconf(sc, (struct ifbrlconf *)data);
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 35e31ea643e..3eddc55d1fd 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bridgestp.c,v 1.65 2017/05/16 12:24:01 mpi Exp $	*/
+/*	$OpenBSD: bridgestp.c,v 1.66 2018/10/22 13:18:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -1607,7 +1607,7 @@ void
 bstp_ifstate(void *arg)
 {
 	struct ifnet *ifp = (struct ifnet *)arg;
-	struct bridge_iflist *p;
+	struct bridge_iflist *bif;
 	struct bstp_port *bp;
 	struct bstp_state *bs;
 	int s;
@@ -1616,11 +1616,11 @@ bstp_ifstate(void *arg)
 		return;
 
 	s = splnet();
-	if ((p = (struct bridge_iflist *)ifp->if_bridgeport) == NULL)
+	if ((bif = (struct bridge_iflist *)ifp->if_bridgeport) == NULL)
 		goto done;
-	if ((p->bif_flags & IFBIF_STP) == 0)
+	if ((bif->bif_flags & IFBIF_STP) == 0)
 		goto done;
-	if ((bp = p->bif_stp) == NULL)
+	if ((bp = bif->bif_stp) == NULL)
 		goto done;
 	if ((bs = bp->bp_bs) == NULL)
 		goto done;
@@ -2083,7 +2083,7 @@ bstp_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	struct bstp_state *bs = sc->sc_stp;
 	struct ifbrparam *ifbp = (struct ifbrparam *)data;
 	struct ifbreq *ifbr = (struct ifbreq *)data;
-	struct bridge_iflist *p;
+	struct bridge_iflist *bif;
 	struct ifnet *ifs;
 	struct bstp_port *bp;
 	int r = 0, err = 0, val;
@@ -2096,16 +2096,16 @@ bstp_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			err = ENOENT;
 			break;
 		}
-		p = (struct bridge_iflist *)ifs->if_bridgeport;
-		if (p == NULL || p->bridge_sc != sc) {
+		bif = (struct bridge_iflist *)ifs->if_bridgeport;
+		if (bif == NULL || bif->bridge_sc != sc) {
 			err = ESRCH;
 			break;
 		}
-		if ((p->bif_flags & IFBIF_STP) == 0) {
+		if ((bif->bif_flags & IFBIF_STP) == 0) {
 			err = EINVAL;
 			break;
 		}
-		bp = p->bif_stp;
+		bp = bif->bif_stp;
 		break;
 	default:
 		break;
-- 
cgit v1.2.3