d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The divert(4) module must always be running in network epoch, thus

Browse Source 
call to if_addr_rlock() isn't needed.
This commit is contained in:
glebius 2019-10-10 23:48:42 +00:00
parent 1bbf4a3048
commit 3c520efd9f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netinet/ip_divert.c
View File

@ -231,10 +231,10 @@ divert_packet(struct mbuf *m, bool incoming)
/* Sanity check */
M_ASSERTPKTHDR(m);
NET_EPOCH_ASSERT();
/* Find IP address for receive interface */
ifp = m->m_pkthdr.rcvif;
if_addr_rlock(ifp);
CK_STAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
if (ifa->ifa_addr->sa_family != AF_INET)
continue;
@ -242,7 +242,6 @@ divert_packet(struct mbuf *m, bool incoming)
((struct sockaddr_in *) ifa->ifa_addr)->sin_addr;
break;
}
if_addr_runlock(ifp);
}
/*
* Record the incoming interface name whenever we have one.