Module Name:    src
Committed By:   ozaki-r
Date:           Fri Dec  8 04:03:51 UTC 2017

Modified Files:
        src/sys/net: if.c if.h if_bridge.c if_vlan.c

Log Message:
Fix build of kernels without ether

By throwing out if_enable_vlan_mtu and if_disable_vlan_mtu that
created a unnecessary dependency from if.c to if_ethersubr.c.

PR kern/52790


To generate a diff of this commit:
cvs rdiff -u -r1.409 -r1.410 src/sys/net/if.c
cvs rdiff -u -r1.249 -r1.250 src/sys/net/if.h
cvs rdiff -u -r1.143 -r1.144 src/sys/net/if_bridge.c
cvs rdiff -u -r1.117 -r1.118 src/sys/net/if_vlan.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.c
diff -u src/sys/net/if.c:1.409 src/sys/net/if.c:1.410
--- src/sys/net/if.c:1.409	Thu Dec  7 10:05:42 2017
+++ src/sys/net/if.c	Fri Dec  8 04:03:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.409 2017/12/07 10:05:42 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.410 2017/12/08 04:03:51 ozaki-r 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.409 2017/12/07 10:05:42 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.410 2017/12/08 04:03:51 ozaki-r Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -3614,30 +3614,6 @@ if_mcast_op(ifnet_t *ifp, const unsigned
 	return rc;
 }
 
-int
-if_enable_vlan_mtu(struct ifnet *ifp)
-{
-	int error;
-
-	mutex_enter(ifp->if_ioctl_lock);
-	error= ether_enable_vlan_mtu(ifp);
-	mutex_exit(ifp->if_ioctl_lock);
-
-	return error;
-}
-
-int
-if_disable_vlan_mtu(struct ifnet *ifp)
-{
-	int error;
-
-	mutex_enter(ifp->if_ioctl_lock);
-	error= ether_disable_vlan_mtu(ifp);
-	mutex_exit(ifp->if_ioctl_lock);
-
-	return error;
-}
-
 static void
 sysctl_sndq_setup(struct sysctllog **clog, const char *ifname,
     struct ifaltq *ifq)

Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.249 src/sys/net/if.h:1.250
--- src/sys/net/if.h:1.249	Wed Dec  6 09:03:12 2017
+++ src/sys/net/if.h	Fri Dec  8 04:03:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.h,v 1.249 2017/12/06 09:03:12 ozaki-r Exp $	*/
+/*	$NetBSD: if.h,v 1.250 2017/12/08 04:03:51 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -1022,8 +1022,6 @@ int	if_do_dad(struct ifnet *);
 int	if_mcast_op(ifnet_t *, const unsigned long, const struct sockaddr *);
 int	if_flags_set(struct ifnet *, const short);
 int	if_clone_list(int, char *, int *);
-int	if_enable_vlan_mtu(struct ifnet *);
-int	if_disable_vlan_mtu(struct ifnet *);
 
 struct	ifnet *ifunit(const char *);
 struct	ifnet *if_get(const char *, struct psref *);

Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.143 src/sys/net/if_bridge.c:1.144
--- src/sys/net/if_bridge.c:1.143	Wed Dec  6 07:40:16 2017
+++ src/sys/net/if_bridge.c	Fri Dec  8 04:03:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bridge.c,v 1.143 2017/12/06 07:40:16 ozaki-r Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.144 2017/12/08 04:03:51 ozaki-r Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.143 2017/12/06 07:40:16 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.144 2017/12/08 04:03:51 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_bridge_ipf.h"
@@ -772,7 +772,9 @@ bridge_ioctl_add(struct bridge_softc *sc
 		}
 		/* FALLTHROUGH */
 	case IFT_L2TP:
-		error = if_enable_vlan_mtu(ifs);
+		mutex_enter(ifs->if_ioctl_lock);
+		error = ether_enable_vlan_mtu(ifs);
+		mutex_exit(ifs->if_ioctl_lock);
 		if (error > 0)
 			goto out;
 		/*
@@ -854,7 +856,9 @@ bridge_ioctl_del(struct bridge_softc *sc
 		 * Don't call it with holding a spin lock.
 		 */
 		(void) ifpromisc(ifs, 0);
-		(void) if_disable_vlan_mtu(ifs);
+		mutex_enter(ifs->if_ioctl_lock);
+		(void) ether_disable_vlan_mtu(ifs);
+		mutex_exit(ifs->if_ioctl_lock);
 		break;
 	default:
 #ifdef DIAGNOSTIC

Index: src/sys/net/if_vlan.c
diff -u src/sys/net/if_vlan.c:1.117 src/sys/net/if_vlan.c:1.118
--- src/sys/net/if_vlan.c:1.117	Wed Dec  6 08:12:54 2017
+++ src/sys/net/if_vlan.c	Fri Dec  8 04:03:51 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_vlan.c,v 1.117 2017/12/06 08:12:54 ozaki-r Exp $	*/
+/*	$NetBSD: if_vlan.c,v 1.118 2017/12/08 04:03:51 ozaki-r 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.117 2017/12/06 08:12:54 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vlan.c,v 1.118 2017/12/08 04:03:51 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -463,7 +463,9 @@ vlan_config(struct ifvlan *ifv, struct i
 		nmib->ifvm_mintu = ETHERMIN;
 
 		if (ec->ec_nvlans++ == 0) {
-			error = if_enable_vlan_mtu(p);
+			mutex_enter(p->if_ioctl_lock);
+			error = ether_enable_vlan_mtu(p);
+			mutex_exit(p->if_ioctl_lock);
 			if (error >= 0) {
 				if (error) {
 					ec->ec_nvlans--;
@@ -610,8 +612,11 @@ vlan_unconfig_locked(struct ifvlan *ifv,
 	case IFT_ETHER:
 	    {
 		struct ethercom *ec = (void *)p;
-		if (--ec->ec_nvlans == 0)
-			(void)if_disable_vlan_mtu(p);
+		if (--ec->ec_nvlans == 0) {
+			mutex_enter(p->if_ioctl_lock);
+			(void) ether_disable_vlan_mtu(p);
+			mutex_exit(p->if_ioctl_lock);
+		}
 
 		ether_ifdetach(ifp);
 		/* Restore vlan_ioctl overwritten by ether_ifdetach */

Reply via email to