svn commit: r356455 - stable/12/sys/net

[Bjoern A. Zeeb]

Author: bz
Date: Tue Jan  7 16:58:39 2020
New Revision: 356455
URL: https://svnweb.freebsd.org/changeset/base/356455

Log:
  MFC r355070:
  
    Allow kernel to compile without BPF.
  
    r297816 added some bpf magic for VIMAGE unconditionally which no longer
    allows kernels to compile without bpf (but with other networking).
    Add the missing ifdef checks and allow a kernel to compile without bpf
    again.
  
    PR:		242136
    Reported by:	dave mischler.com

Modified:
  stable/12/sys/net/if.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/net/if.c
==============================================================================
--- stable/12/sys/net/if.c	Tue Jan  7 16:54:53 2020	(r356454)
+++ stable/12/sys/net/if.c	Tue Jan  7 16:58:39 2020	(r356455)
@@ -32,6 +32,7 @@
  * $FreeBSD$
  */
 
+#include "opt_bpf.h"
 #include "opt_inet6.h"
 #include "opt_inet.h"
 
@@ -1244,16 +1245,20 @@ static void
 if_vmove(struct ifnet *ifp, struct vnet *new_vnet)
 {
 	struct if_clone *ifc;
+#ifdef DEV_BPF
 	u_int bif_dlt, bif_hdrlen;
+#endif
 	void *old;
 	int rc;
 
+#ifdef DEV_BPF
  	/*
 	 * if_detach_internal() will call the eventhandler to notify
 	 * interface departure.  That will detach if_bpf.  We need to
 	 * safe the dlt and hdrlen so we can re-attach it later.
 	 */
 	bpf_get_bp_params(ifp->if_bpf, &bif_dlt, &bif_hdrlen);
+#endif
 
 	/*
 	 * Detach from current vnet, but preserve LLADDR info, do not
@@ -1300,8 +1305,10 @@ if_vmove(struct ifnet *ifp, struct vnet *new_vnet)
 
 	if_attach_internal(ifp, 1, ifc);
 
+#ifdef DEV_BPF
 	if (ifp->if_bpf == NULL)
 		bpfattach(ifp, bif_dlt, bif_hdrlen);
+#endif
 
 	CURVNET_RESTORE();
 }