diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-20 09:38:18 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-10-20 09:38:18 +0000 |
| commit | 2be522c3c3fcbf48e5acbbbd29c1c7bd8ae6fc5b (patch) | |
| tree | 7aa8b9c21b60a12a826ba3a3dbc9492cee858185 /sys | |
| parent | 34cfb4dc3e8c6c7c8bf396ae6446f109f04c7fe9 (diff) | |
Do not test if if_ioctl is NULL, it isn't.
ok florian@, claudio@, visa@, bluhm@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/in.c | 7 | ||||
| -rw-r--r-- | sys/netinet6/in6.c | 9 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/netinet/in.c b/sys/netinet/in.c index 71e58d18943..e09da7b83c6 100644 --- a/sys/netinet/in.c +++ b/sys/netinet/in.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in.c,v 1.140 2017/08/11 19:53:02 bluhm Exp $ */ +/* $OpenBSD: in.c,v 1.141 2017/10/20 09:38:17 mpi Exp $ */ /* $NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $ */ /* @@ -406,8 +406,6 @@ in_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int privileged) break; default: - if (ifp->if_ioctl == NULL) - return (EOPNOTSUPP); error = ((*ifp->if_ioctl)(ifp, cmd, data)); return (error); } @@ -826,9 +824,6 @@ in_addmulti(struct in_addr *ap, struct ifnet *ifp) */ ++inm->inm_refcnt; } else { - if (ifp->if_ioctl == NULL) - return (NULL); - /* * New address; allocate a new multicast record * and link it into the interface's multicast list. diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 4b6ed78ef91..f8ac6b91dfc 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.212 2017/10/16 13:40:58 mpi Exp $ */ +/* $OpenBSD: in6.c,v 1.213 2017/10/20 09:38:17 mpi Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -489,8 +489,6 @@ in6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, int privileged) break; default: - if (ifp->if_ioctl == NULL) - return (EOPNOTSUPP); error = ((*ifp->if_ioctl)(ifp, cmd, data)); return (error); } @@ -1247,11 +1245,6 @@ in6_addmulti(struct in6_addr *maddr6, struct ifnet *ifp, int *errorp) */ in6m->in6m_refcnt++; } else { - if (ifp->if_ioctl == NULL) { - *errorp = ENXIO; /* XXX: appropriate? */ - return (NULL); - } - /* * New address; allocate a new multicast record * and link it into the interface's multicast list. |