Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/evbarm/conf/MMNET_GENERIC,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/evbarm/conf/MMNET_GENERIC,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.34.2.3
retrieving revision 1.34.2.4
diff -u -p -r1.34.2.3 -r1.34.2.4
--- src/sys/arch/evbarm/conf/MMNET_GENERIC	2018/07/28 04:37:31	1.34.2.3
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC	2018/09/06 06:55:30	1.34.2.4
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.34.2.3 2018/07/28 04:37:31 pgoyette Exp $
+# $NetBSD: MMNET_GENERIC,v 1.34.2.4 2018/09/06 06:55:30 pgoyette Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mmnet"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.34.2.3 $"
+#ident 		"GENERIC-$Revision: 1.34.2.4 $"
 
 maxusers	32		# estimated number of users
 
@@ -95,7 +95,6 @@ options 	COMPAT_NETBSD32	# allow running
 
 #options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
 #options 	COMPAT_LINUX	# binary compatibility with Linux
-#options 	COMPAT_NDIS	# NDIS network driver
 
 # File systems
 file-system 	FFS		# UFS
@@ -145,9 +144,6 @@ options 	INET		# IP + ICMP + TCP + UDP
 options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
 options 	PPP_DEFLATE	# Deflate compression support for PPP
 options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
-options 	IPFILTER_LOG	# ipmon(8) log support
-options 	IPFILTER_LOOKUP	# ippool(8) support
-#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
 #options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
 
 #options 	ALTQ		# Manipulate network interfaces' output queues
@@ -354,11 +350,7 @@ sd*	at atapibus? drive ? flags 0x0000	# 
 #sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
 #tlphy*	at mii? phy ?			# ThunderLAN PHYs
 #tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
-ukphy*	at at91emac? phy ?
-ukphy*	at aue? phy ?			# generic unknown PHYs
-ukphy*	at axe? phy ?			# generic unknown PHYs
-ukphy*	at udav? phy ?			# generic unknown PHYs
-ukphy*	at url? phy ?			# generic unknown PHYs
+ukphy*	at mii? phy ?			# generic unknown PHYs
 #urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
 
 
@@ -424,6 +416,7 @@ axe*	at uhub? port ?		# ASIX AX88172 bas
 cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
 cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
 kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
+mue*	at uhub? port ?		# Microchip LAN75xx/LAN78xx based adapters
 udav*	at uhub? port ?		# Davicom DM9601 based adapters
 url*	at uhub? port ?		# Realtek RTL8150L based adapters
 
@@ -561,7 +554,7 @@ pseudo-device	md			# memory disk device 
 # network pseudo-devices
 pseudo-device	bpfilter		# Berkeley packet filter
 #pseudo-device	carp			# Common Address Redundancy Protocol
-pseudo-device	ipfilter		# IP filter (firewall) and NAT
+pseudo-device	npf			# NPF packet filter
 pseudo-device	loop			# network loopback
 pseudo-device	ppp			# Point-to-Point Protocol
 #pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
@@ -577,8 +570,6 @@ pseudo-device	tun			# network tunneling 
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 #options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
-pseudo-device	pf			# PF packet filter
-pseudo-device	pflog			# PF log if
 # srt is EXPERIMENTAL
 #pseudo-device	srt			# source-address-based routing