aboutsummaryrefslogtreecommitdiff
path: root/sys/netinet/if_ether.c
diff options
context:
space:
mode:
authorAlexander V. Chernikov <melifaro@FreeBSD.org>2015-11-07 11:12:00 +0000
committerAlexander V. Chernikov <melifaro@FreeBSD.org>2015-11-07 11:12:00 +0000
commitddd208f7addb378feb10e5148cdec2142d57d0c1 (patch)
tree814c7d157de580df906def7cdb0e62992bf93266 /sys/netinet/if_ether.c
parentfa32340b9f0ef5ae09df26328e8510ef1eef3a6b (diff)
Notes
Diffstat (limited to 'sys/netinet/if_ether.c')
-rw-r--r--sys/netinet/if_ether.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index aa616eb39d54f..f9d3612b046a3 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -141,8 +141,6 @@ static void in_arpinput(struct mbuf *);
static void arp_check_update_lle(struct arphdr *ah, struct in_addr isaddr,
struct ifnet *ifp, int bridged, struct llentry *la);
-static void arp_update_lle(struct arphdr *ah, struct ifnet *ifp,
- struct llentry *la);
static void arp_mark_lle_reachable(struct llentry *la);
@@ -820,7 +818,7 @@ match:
la = lltable_alloc_entry(LLTABLE(ifp), 0, dst);
if (la == NULL)
goto drop;
- arp_update_lle(ah, ifp, la);
+ lltable_set_entry_addr(ifp, la, ar_sha(ah));
IF_AFDATA_WLOCK(ifp);
LLE_WLOCK(la);
@@ -1038,7 +1036,7 @@ arp_check_update_lle(struct arphdr *ah, struct in_addr isaddr, struct ifnet *ifp
}
/* Update data */
- arp_update_lle(ah, ifp, la);
+ lltable_set_entry_addr(ifp, la, ar_sha(ah));
IF_AFDATA_WUNLOCK(ifp);
LLE_REMREF(la);
@@ -1070,17 +1068,6 @@ arp_check_update_lle(struct arphdr *ah, struct in_addr isaddr, struct ifnet *ifp
LLE_WUNLOCK(la);
}
-/*
- * Updates @la fields used by fast path code.
- */
-static void
-arp_update_lle(struct arphdr *ah, struct ifnet *ifp, struct llentry *la)
-{
-
- memcpy(&la->ll_addr, ar_sha(ah), ifp->if_addrlen);
- la->la_flags |= LLE_VALID;
-}
-
static void
arp_mark_lle_reachable(struct llentry *la)
{