diff options
| author |   tedu <tedu@openbsd.org> | 2014-11-29 18:50:06 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-11-29 18:50:06 +0000 |
| commit | 281fd0248732f499a1021e5e83592385db112b76 (patch) | |
| tree | d4b1b5e681302463578f3c360f50d645c03c8f44 /sys/net/if_ethersubr.c | |
| parent | simplify the interactive code into its own little object with simpler (diff) | |
| download | wireguard-openbsd-281fd0248732f499a1021e5e83592385db112b76.tar.xz wireguard-openbsd-281fd0248732f499a1021e5e83592385db112b76.zip | |
restore the "hot" memcpy that existed before recent conversion flipflop
Diffstat (limited to '')
| -rw-r--r-- | sys/net/if_ethersubr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 545a744f181..77113a4ff94 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ethersubr.c,v 1.179 2014/11/20 14:51:42 krw Exp $ */ +/* $OpenBSD: if_ethersubr.c,v 1.180 2014/11/29 18:50:06 tedu Exp $ */ /* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */ /* @@ -209,8 +209,8 @@ ether_addheader(struct mbuf **m, struct ifnet *ifp, u_int16_t etype, if (*m == NULL) return (-1); evh = mtod(*m, struct ether_vlan_header *); - memmove(evh->evl_dhost, edst, sizeof(evh->evl_dhost)); - memmove(evh->evl_shost, esrc, sizeof(evh->evl_shost)); + memcpy(evh->evl_dhost, edst, sizeof(evh->evl_dhost)); + memcpy(evh->evl_shost, esrc, sizeof(evh->evl_shost)); evh->evl_proto = etype; evh->evl_encap_proto = htons(ifv->ifv_type); evh->evl_tag = htons(ifv->ifv_tag + @@ -225,8 +225,8 @@ ether_addheader(struct mbuf **m, struct ifnet *ifp, u_int16_t etype, return (-1); eh = mtod(*m, struct ether_header *); eh->ether_type = etype; - memmove(eh->ether_dhost, edst, sizeof(eh->ether_dhost)); - memmove(eh->ether_shost, esrc, sizeof(eh->ether_shost)); + memcpy(eh->ether_dhost, edst, sizeof(eh->ether_dhost)); + memcpy(eh->ether_shost, esrc, sizeof(eh->ether_shost)); return (0); } |