Module Name: src
Committed By: yamaguchi
Date: Thu Jun 14 07:54:57 UTC 2018
Modified Files:
src/sys/net: if_ethersubr.c if_vlan.c
src/sys/netinet: ip_carp.c
Log Message:
Use ether_lookup_multi() instead of the macro
ok ozaki-r@
To generate a diff of this commit:
cvs rdiff -u -r1.269 -r1.270 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.126 -r1.127 src/sys/net/if_vlan.c
cvs rdiff -u -r1.96 -r1.97 src/sys/netinet/ip_carp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.269 src/sys/net/if_ethersubr.c:1.270
--- src/sys/net/if_ethersubr.c:1.269 Tue Jun 12 07:12:35 2018
+++ src/sys/net/if_ethersubr.c Thu Jun 14 07:54:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.269 2018/06/12 07:12:35 ozaki-r Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.270 2018/06/14 07:54:57 yamaguchi Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.269 2018/06/12 07:12:35 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.270 2018/06/14 07:54:57 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1282,7 +1282,7 @@ ether_addmulti(const struct sockaddr *sa
/*
* See if the address range is already in the list.
*/
- ETHER_LOOKUP_MULTI(addrlo, addrhi, ec, _enm);
+ _enm = ether_lookup_multi(addrlo, addrhi, ec);
if (_enm != NULL) {
/*
* Found it; just increment the reference count.
@@ -1334,7 +1334,7 @@ ether_delmulti(const struct sockaddr *sa
/*
* Look up the address in our list.
*/
- ETHER_LOOKUP_MULTI(addrlo, addrhi, ec, enm);
+ enm = ether_lookup_multi(addrlo, addrhi, ec);
if (enm == NULL) {
error = ENXIO;
goto error;
Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.126 src/sys/net/if_vlan.c:1.127
--- src/sys/net/if_vlan.c:1.126 Tue Jun 12 04:20:36 2018
+++ src/sys/net/if_vlan.c Thu Jun 14 07:54:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vlan.c,v 1.126 2018/06/12 04:20:36 ozaki-r Exp $ */
+/* $NetBSD: if_vlan.c,v 1.127 2018/06/14 07:54:57 yamaguchi Exp $ */
/*
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.126 2018/06/12 04:20:36 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.127 2018/06/14 07:54:57 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1176,7 +1176,7 @@ vlan_ether_addmulti(struct ifvlan *ifv,
*/
error = ether_multiaddr(sa, addrlo, addrhi);
KASSERT(error == 0);
- ETHER_LOOKUP_MULTI(addrlo, addrhi, &ifv->ifv_ec, mc->mc_enm);
+ mc->mc_enm = ether_lookup_multi(addrlo, addrhi, &ifv->ifv_ec);
KASSERT(mc->mc_enm != NULL);
memcpy(&mc->mc_addr, sa, sa->sa_len);
@@ -1221,7 +1221,7 @@ vlan_ether_delmulti(struct ifvlan *ifv,
*/
if ((error = ether_multiaddr(sa, addrlo, addrhi)) != 0)
return error;
- ETHER_LOOKUP_MULTI(addrlo, addrhi, &ifv->ifv_ec, enm);
+ enm = ether_lookup_multi(addrlo, addrhi, &ifv->ifv_ec);
error = ether_delmulti(sa, &ifv->ifv_ec);
if (error != ENETRESET)
Index: src/sys/netinet/ip_carp.c
diff -u src/sys/netinet/ip_carp.c:1.96 src/sys/netinet/ip_carp.c:1.97
--- src/sys/netinet/ip_carp.c:1.96 Fri May 18 18:58:51 2018
+++ src/sys/netinet/ip_carp.c Thu Jun 14 07:54:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_carp.c,v 1.96 2018/05/18 18:58:51 maxv Exp $ */
+/* $NetBSD: ip_carp.c,v 1.97 2018/06/14 07:54:57 yamaguchi Exp $ */
/* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */
/*
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.96 2018/05/18 18:58:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.97 2018/06/14 07:54:57 yamaguchi Exp $");
/*
* TODO:
@@ -2312,7 +2312,7 @@ carp_ether_addmulti(struct carp_softc *s
* statement shouldn't fail.
*/
(void)ether_multiaddr(sa, addrlo, addrhi);
- ETHER_LOOKUP_MULTI(addrlo, addrhi, &sc->sc_ac, mc->mc_enm);
+ mc->mc_enm = ether_lookup_multi(addrlo, addrhi, &sc->sc_ac);
memcpy(&mc->mc_addr, sa, sa->sa_len);
LIST_INSERT_HEAD(&sc->carp_mc_listhead, mc, mc_entries);
@@ -2351,7 +2351,7 @@ carp_ether_delmulti(struct carp_softc *s
*/
if ((error = ether_multiaddr(sa, addrlo, addrhi)) != 0)
return (error);
- ETHER_LOOKUP_MULTI(addrlo, addrhi, &sc->sc_ac, enm);
+ enm = ether_lookup_multi(addrlo, addrhi, &sc->sc_ac);
if (enm == NULL)
return (EINVAL);
