carp: BGL -> CARP global token

DragonFlyBSD · Jan 22, 2012 · 0eb2639 · 0eb2639
1 parent f534cac
commit 0eb2639
Show file tree

Hide file tree

Showing 5 changed files with 110 additions and 42 deletions.
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
@@ -335,14 +335,14 @@ ether_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
 #ifdef CARP
 	if (ifp->if_carp) {
 		/*
-		 * Hold BGL and recheck ifp->if_carp
+		 * Hold CARP token and recheck ifp->if_carp
 		 */
-		get_mplock();
+		carp_gettok();
 		if (ifp->if_carp && (error = carp_output(ifp, m, dst, NULL))) {
-			rel_mplock();
+			carp_reltok();
 			goto bad;
 		}
-		rel_mplock();
+		carp_reltok();
 	}
 #endif
 
@@ -1019,14 +1019,14 @@ ether_demux_oncpu(struct ifnet *ifp, struct mbuf *m)
 	 */
 	if (ifp->if_carp) {
 		/*
-		 * Hold BGL and recheck ifp->if_carp
+		 * Hold CARP token and recheck ifp->if_carp
 		 */
-		get_mplock();
+		carp_gettok();
 		if (ifp->if_carp && carp_forus(ifp->if_carp, eh->ether_dhost)) {
-			rel_mplock();
+			carp_reltok();
 			goto post_stats;
 		}
-		rel_mplock();
+		carp_reltok();
 	}
 #endif
 

diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
@@ -871,14 +871,14 @@ in_arpinput(struct mbuf *m)
 	myaddr.s_addr = INADDR_ANY;
 #ifdef CARP
 	if (ifp->if_carp != NULL) {
-		get_mplock();
+		carp_gettok();
 		if (ifp->if_carp != NULL &&
 		    carp_iamatch(ifp->if_carp, &itaddr, &isaddr, &enaddr)) {
-			rel_mplock();
+			carp_reltok();
 			myaddr = itaddr;
 			goto match;
 		}
-		rel_mplock();
+		carp_reltok();
 	}
 #endif