diff --git a/sys/net/if.c b/sys/net/if.c index 8e9e6d9f8e1d..3229f52a1b4e 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.474 2020/04/18 15:56:26 thorpej Exp $ */ +/* $NetBSD: if.c,v 1.475 2020/05/05 08:05:03 jdolecek Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.474 2020/04/18 15:56:26 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.475 2020/05/05 08:05:03 jdolecek Exp $"); #if defined(_KERNEL_OPT) #include "opt_inet.h" @@ -3791,12 +3791,8 @@ if_mcast_op(ifnet_t *ifp, const unsigned long cmd, const struct sockaddr *sa) int rc; struct ifreq ifr; - if (ifp->if_mcastop != NULL) - rc = (*ifp->if_mcastop)(ifp, cmd, sa); - else { - ifreq_setaddr(cmd, &ifr, sa); - rc = (*ifp->if_ioctl)(ifp, cmd, &ifr); - } + ifreq_setaddr(cmd, &ifr, sa); + rc = (*ifp->if_ioctl)(ifp, cmd, &ifr); return rc; } diff --git a/sys/net/if.h b/sys/net/if.h index 1e24577dfb02..4e25b660e981 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -1,4 +1,4 @@ -/* $NetBSD: if.h,v 1.282 2020/02/14 22:04:12 thorpej Exp $ */ +/* $NetBSD: if.h,v 1.283 2020/05/05 08:05:03 jdolecek Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -381,9 +381,6 @@ typedef struct ifnet { *if_sysctl_log; /* :: */ int (*if_initaddr) /* :: */ (struct ifnet *, struct ifaddr *, bool); - int (*if_mcastop) /* :: */ - (struct ifnet *, const unsigned long, - const struct sockaddr *); int (*if_setflags) /* :: */ (struct ifnet *, const u_short); kmutex_t *if_ioctl_lock; /* :: */