From d0866edf4d28ba80f8cc3e9996e195eae920dac5 Mon Sep 17 00:00:00 2001
From: Ryan Thomas McBride <mcbride@cvs.openbsd.org>
Date: Fri, 10 Dec 2004 22:35:18 +0000
Subject: Rename carp_output() to carp_fix_lladdr().

---
 sys/net/if_ethersubr.c | 4 ++--
 sys/net/if_fddisubr.c  | 4 ++--
 sys/netinet/ip_carp.c  | 6 +++---
 sys/netinet/ip_carp.h  | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index e9a4f20a5f9..dee823be08c 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ethersubr.c,v 1.84 2004/12/09 16:57:35 mcbride Exp $	*/
+/*	$OpenBSD: if_ethersubr.c,v 1.85 2004/12/10 22:35:17 mcbride Exp $	*/
 /*	$NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $	*/
 
 /*
@@ -536,7 +536,7 @@ ether_output(ifp0, m0, dst, rt0)
 
 #if NCARP > 0
 	if (ifp->if_carp) {
-		error = carp_output(ifp0, m, dst, NULL);
+		error = carp_fix_lladdr(ifp0, m, dst, NULL);
 		if (error)
 			goto bad;
 	}
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index f579f97484f..3a0f4800ff8 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fddisubr.c,v 1.41 2004/12/09 16:57:35 mcbride Exp $	*/
+/*	$OpenBSD: if_fddisubr.c,v 1.42 2004/12/10 22:35:17 mcbride Exp $	*/
 /*	$NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $	*/
 
 /*
@@ -396,7 +396,7 @@ fddi_output(ifp, m0, dst, rt0)
 		    sizeof(fh->fddi_shost));
 #if NCARP > 0
 	if (ifp->if_carp) { 
-		error = carp_output(ifp, m, NULL, NULL);
+		error = carp_fix_lladdr(ifp, m, NULL, NULL);
 		if (error)
 			goto bad;
 	}
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index f35081bc8c1..e088a80c6ab 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.c,v 1.77 2004/12/08 17:06:12 pat Exp $	*/
+/*	$OpenBSD: ip_carp.c,v 1.78 2004/12/10 22:35:17 mcbride Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -794,7 +794,7 @@ carp_prepare_ad(struct mbuf *m, struct carp_softc *sc, struct carp_header *ch)
 
 	carp_hmac_generate(sc, ch->carp_counter, ch->carp_md);
 
-	/* Tag packet for carp_output */
+	/* Tag packet for carp_fix_lladdr */
 	mtag = m_tag_get(PACKET_TAG_CARP, sizeof(struct ifnet *), M_NOWAIT);
 	if (mtag == NULL) {
 		m_freem(m);
@@ -1923,7 +1923,7 @@ carp_start(struct ifnet *ifp)
 }
 
 int
-carp_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
+carp_fix_lladdr(struct ifnet *ifp, struct mbuf *m, struct sockaddr *sa,
     struct rtentry *rt)
 {
 	struct m_tag *mtag;
diff --git a/sys/netinet/ip_carp.h b/sys/netinet/ip_carp.h
index 0c6720671f3..86a053770b6 100644
--- a/sys/netinet/ip_carp.h
+++ b/sys/netinet/ip_carp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_carp.h,v 1.10 2004/12/08 06:57:55 mcbride Exp $	*/
+/*	$OpenBSD: ip_carp.h,v 1.11 2004/12/10 22:35:17 mcbride Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff. All rights reserved.
@@ -155,8 +155,8 @@ void		 carp_ifdetach (struct ifnet *);
 void		 carp_proto_input (struct mbuf *, ...);
 void		 carp_carpdev_state(struct ifnet *);
 int		 carp6_proto_input(struct mbuf **, int *, int);
-int		 carp_output(struct ifnet *, struct mbuf *, struct sockaddr *,
-		     struct rtentry *);
+int		 carp_fix_lladdr(struct ifnet *, struct mbuf *,
+		     struct sockaddr *, struct rtentry *);
 int		 carp_iamatch(void *, struct in_ifaddr *, struct in_addr *,
 		     u_int8_t **);
 struct ifaddr	*carp_iamatch6(void *, struct in6_addr *);
-- 
cgit v1.2.3