Module Name: src
Committed By: jdolecek
Date: Tue May 5 08:05:03 UTC 2020
Modified Files:
src/sys/net: if.c if.h
Log Message:
remove struct ifnet if_mcastop, it's not used by anything
To generate a diff of this commit:
cvs rdiff -u -r1.474 -r1.475 src/sys/net/if.c
cvs rdiff -u -r1.282 -r1.283 src/sys/net/if.h
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.c
diff -u src/sys/net/if.c:1.474 src/sys/net/if.c:1.475
--- src/sys/net/if.c:1.474 Sat Apr 18 15:56:26 2020
+++ src/sys/net/if.c Tue May 5 08:05:03 2020
@@ -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 <sys/cdefs.h>
-__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
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;
}
Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.282 src/sys/net/if.h:1.283
--- src/sys/net/if.h:1.282 Fri Feb 14 22:04:12 2020
+++ src/sys/net/if.h Tue May 5 08:05:03 2020
@@ -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; /* :: */
