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

MFC r284512: Properly handle locking on the ARP protocol request sending.

Browse Source
This commit is contained in:
eri 2015-06-24 19:06:54 +00:00
parent bad6606621
commit 5d11dcc720
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/netinet/if_ether.c
View File

@ -365,6 +365,7 @@ retry:
if ((la->la_flags & LLE_VALID) &&
((la->la_flags & LLE_STATIC) || la->la_expire > time_uptime)) {
bcopy(&la->ll_addr, desten, ifp->if_addrlen);
renew = 0;
/*
* If entry has an expiry time and it is approaching,
* see if we need to send an ARP request within this
@ -372,13 +373,21 @@ retry:
*/
if (!(la->la_flags & LLE_STATIC) &&
time_uptime + la->la_preempt > la->la_expire) {
arprequest(ifp, NULL, &SIN(dst)->sin_addr, NULL);
renew = 1;
la->la_preempt--;
}
*lle = la;
error = 0;
goto done;
if (flags & LLE_EXCLUSIVE)
LLE_WUNLOCK(la);
else
LLE_RUNLOCK(la);
if (renew == 1)
arprequest(ifp, NULL, &SIN(dst)->sin_addr, NULL);
return (0);
}
if (la->la_flags & LLE_STATIC) { /* should not happen! */