Deleted Added
full compact
34c34
< * $FreeBSD: head/sys/netinet/if_ether.c 109996 2003-01-28 20:22:19Z hsu $
---
> * $FreeBSD: head/sys/netinet/if_ether.c 110308 2003-02-04 05:28:08Z orion $
99,100c99,101
< struct mbuf *la_hold; /* last packet until resolved/timeout */
< long la_asked; /* last time we QUERIED for this addr */
---
> struct mbuf *la_hold; /* last packet until resolved/timeout */
> u_short la_preempt; /* #times we QUERIED before entry expiration */
> u_short la_asked; /* #times we QUERIED following expiration */
444,445c445,446
< (time_second + (arp_maxtries - la->la_asked) * arpt_down >
< rt->rt_expire)) {
---
> (time_second + (arp_maxtries - la->la_preempt) * arpt_down
> > rt->rt_expire)) {
450c451
< la->la_asked++;
---
> la->la_preempt++;
478,483c479,484
< if (la->la_asked++ < arp_maxtries)
< arprequest(ifp,
< &SIN(rt->rt_ifa->ifa_addr)->sin_addr,
< &SIN(dst)->sin_addr,
< IF_LLADDR(ifp));
< else {
---
> if (la->la_asked++ < arp_maxtries) {
> arprequest(ifp,
> &SIN(rt->rt_ifa->ifa_addr)->sin_addr,
> &SIN(dst)->sin_addr,
> IF_LLADDR(ifp));
> } else {
486c487
< la->la_asked = 0;
---
> la->la_preempt = la->la_asked = 0;
747c748
< la->la_asked = 0;
---
> la->la_preempt = la->la_asked = 0;
897c898
< la->la_asked = 0;
---
> la->la_preempt = la->la_asked = 0;