svn commit: r356622 - stable/12/sys/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Sat Jan 11 00:11:29 2020
New Revision: 356622
URL: https://svnweb.freebsd.org/changeset/base/356622

Log:
  MFC r355449,355466:
  
    carp: replace caddr_t with char *
  
    Change the remaining caddr_t usages to char * following the removal
    of the KAME macros
  
    No functional change.

Modified:
  stable/12/sys/netinet/ip_carp.c
  stable/12/sys/netinet/ip_carp.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/netinet/ip_carp.c
==============================================================================
--- stable/12/sys/netinet/ip_carp.c	Sat Jan 11 00:08:16 2020	(r356621)
+++ stable/12/sys/netinet/ip_carp.c	Sat Jan 11 00:11:29 2020	(r356622)
@@ -575,7 +575,7 @@ carp6_input(struct mbuf **mp, int *offp, int proto)
 			return (IPPROTO_DONE);
 		}
 	}
-	ch = (struct carp_header *)(mtod(m, caddr_t) + *offp);
+	ch = (struct carp_header *)(mtod(m, char *) + *offp);
 
 
 	/* verify the CARP checksum */
@@ -1190,7 +1190,7 @@ carp_iamatch6(struct ifnet *ifp, struct in6_addr *tadd
 	return (ifa);
 }
 
-caddr_t
+char *
 carp_macmatch6(struct ifnet *ifp, struct mbuf *m, const struct in6_addr *taddr)
 {
 	struct ifaddr *ifa;
@@ -1849,7 +1849,7 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct threa
 				carp_carprcp(&carpr, sc, priveleged);
 				carpr.carpr_count = count;
 				error = copyout(&carpr,
-				    (caddr_t)ifr_data_get_ptr(ifr) +
+				    (char *)ifr_data_get_ptr(ifr) +
 				    (i * sizeof(carpr)), sizeof(carpr));
 				if (error) {
 					CIF_UNLOCK(ifp->if_carp);

Modified: stable/12/sys/netinet/ip_carp.h
==============================================================================
--- stable/12/sys/netinet/ip_carp.h	Sat Jan 11 00:08:16 2020	(r356621)
+++ stable/12/sys/netinet/ip_carp.h	Sat Jan 11 00:11:29 2020	(r356622)
@@ -149,7 +149,7 @@ int		carp_output (struct ifnet *, struct mbuf *,
 int		carp_master(struct ifaddr *);
 int		carp_iamatch(struct ifaddr *, uint8_t **);
 struct ifaddr	*carp_iamatch6(struct ifnet *, struct in6_addr *);
-caddr_t		carp_macmatch6(struct ifnet *, struct mbuf *, const struct in6_addr *);
+char *		carp_macmatch6(struct ifnet *, struct mbuf *, const struct in6_addr *);
 int		carp_forus(struct ifnet *, u_char *);
 
 /* These are external networking stack hooks for CARP */
@@ -174,7 +174,7 @@ extern int (*carp_iamatch_p)(struct ifaddr *, uint8_t 
 #ifdef INET6
 /* netinet6/nd6_nbr.c */
 extern struct ifaddr *(*carp_iamatch6_p)(struct ifnet *, struct in6_addr *);
-extern caddr_t (*carp_macmatch6_p)(struct ifnet *, struct mbuf *,
+extern char * (*carp_macmatch6_p)(struct ifnet *, struct mbuf *,
     const struct in6_addr *);
 #endif
 #endif