Page MenuHomeFreeBSD
Files F106136374

D22399.diff
No OneTemporary
Actions

D22399.diff
View Options

Index: head/sys/netinet/ip_carp.h
===================================================================
--- head/sys/netinet/ip_carp.h
+++ head/sys/netinet/ip_carp.h
@@ -149,7 +149,7 @@
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 @@
#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
Index: head/sys/netinet/ip_carp.c
===================================================================
--- head/sys/netinet/ip_carp.c
+++ head/sys/netinet/ip_carp.c
@@ -575,7 +575,7 @@
return (IPPROTO_DONE);
}
}
- ch = (struct carp_header *)(mtod(m, caddr_t) + *offp);
+ ch = (struct carp_header *)(mtod(m, char *) + *offp);
/* verify the CARP checksum */
@@ -978,6 +978,7 @@
#endif /* INET */
#ifdef INET6
if (sc->sc_naddrs6) {
+ struct epoch_tracker et;
struct ip6_hdr *ip6;
m = m_gethdr(M_NOWAIT, MT_DATA);
@@ -1031,8 +1032,10 @@
CARPSTATS_INC(carps_opackets6);
+ NET_EPOCH_ENTER(et);
carp_send_ad_error(sc, ip6_output(m, NULL, NULL, 0,
&sc->sc_carpdev->if_carp->cif_im6o, NULL, NULL));
+ NET_EPOCH_EXIT(et);
}
#endif /* INET6 */
@@ -1190,7 +1193,7 @@
return (ifa);
}
-caddr_t
+char *
carp_macmatch6(struct ifnet *ifp, struct mbuf *m, const struct in6_addr *taddr)
{
struct ifaddr *ifa;
@@ -1847,7 +1850,7 @@
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);

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 12:12 AM (12 h, 4 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15609347
Default Alt Text
D22399.diff (2 KB)

Event Timeline