mirror of
https://git.FreeBSD.org/src.git
synced 2024-10-19 02:29:40 +00:00
Remove the rt argument from nd6_storelladdr() because
rt is no longer accessed.
This commit is contained in:
parent
f16e1269b4
commit
9928dafbb8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=186217
@ -167,7 +167,7 @@ arc_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
|
||||
#endif
|
||||
#ifdef INET6
|
||||
case AF_INET6:
|
||||
error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)&adst, &lle);
|
||||
error = nd6_storelladdr(ifp, m, dst, (u_char *)&adst, &lle);
|
||||
if (error)
|
||||
return (error);
|
||||
atype = ARCTYPE_INET6;
|
||||
|
@ -225,7 +225,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m,
|
||||
#endif
|
||||
#ifdef INET6
|
||||
case AF_INET6:
|
||||
error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle);
|
||||
error = nd6_storelladdr(ifp, m, dst, (u_char *)edst, &lle);
|
||||
if (error)
|
||||
return error;
|
||||
type = htons(ETHERTYPE_IPV6);
|
||||
|
@ -175,7 +175,7 @@ fddi_output(ifp, m, dst, rt0)
|
||||
#endif /* INET */
|
||||
#ifdef INET6
|
||||
case AF_INET6:
|
||||
error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle);
|
||||
error = nd6_storelladdr(ifp, m, dst, (u_char *)edst, &lle);
|
||||
if (error)
|
||||
return (error); /* Something bad happened */
|
||||
type = htons(ETHERTYPE_IPV6);
|
||||
|
@ -167,7 +167,7 @@ firewire_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
|
||||
#ifdef INET6
|
||||
case AF_INET6:
|
||||
if (unicast) {
|
||||
error = nd6_storelladdr(fc->fc_ifp, rt0, m, dst,
|
||||
error = nd6_storelladdr(fc->fc_ifp, m, dst,
|
||||
(u_char *) destfw, &lle);
|
||||
if (error)
|
||||
return (error);
|
||||
|
@ -319,7 +319,7 @@ iso88025_output(ifp, m, dst, rt0)
|
||||
#endif /* INET */
|
||||
#ifdef INET6
|
||||
case AF_INET6:
|
||||
error = nd6_storelladdr(ifp, rt0, m, dst, (u_char *)edst, &lle);
|
||||
error = nd6_storelladdr(ifp, m, dst, (u_char *)edst, &lle);
|
||||
if (error)
|
||||
return (error);
|
||||
snap_type = ETHERTYPE_IPV6;
|
||||
|
@ -1554,7 +1554,6 @@ nd6_prefix_onlink(struct nd_prefix *pr)
|
||||
char ip6buf[INET6_ADDRSTRLEN];
|
||||
struct sockaddr_dl null_sdl = {sizeof(null_sdl), AF_LINK};
|
||||
|
||||
|
||||
/* sanity check */
|
||||
if ((pr->ndpr_stateflags & NDPRF_ONLINK) != 0) {
|
||||
nd6log((LOG_ERR,
|
||||
@ -1623,7 +1622,6 @@ nd6_prefix_onlink(struct nd_prefix *pr)
|
||||
rtflags = ifa->ifa_flags | RTF_UP;
|
||||
error = rtrequest(RTM_ADD, (struct sockaddr *)&pr->ndpr_prefix,
|
||||
ifa->ifa_addr, (struct sockaddr *)&mask6, rtflags, &rt);
|
||||
|
||||
if (error == 0) {
|
||||
if (rt != NULL) /* this should be non NULL, though */ {
|
||||
rnh = V_rt_tables[rt->rt_fibnum][AF_INET6];
|
||||
|
Loading…
Reference in New Issue
Block a user