--- zzzz-none-000/linux-4.1.38/net/Kconfig	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/net/Kconfig	2020-11-25 10:06:48.000000000 +0000
@@ -25,6 +25,14 @@
 
 if NET
 
+config NET_DEV_LOAD
+	bool "Automatic load of network device modules"
+    default n
+	help
+	  When this option is set access to a not existing network device,
+	  will trigger automatic module load for the network device.
+	  For desktop systems: say Y.
+
 config WANT_COMPAT_NETLINK_MESSAGES
 	bool
 	help
@@ -52,6 +60,16 @@
 source "net/xfrm/Kconfig"
 source "net/iucv/Kconfig"
 
+config AVM_NET_SKB_INPUT_DEV
+	bool "Store input device in skb"
+	depends on AVM_ENHANCED
+	default y
+	---help---
+	  AVM extension
+
+	  Stores the lowest-level input device in skb, because iif gets overwritten as
+	  the skb travels through the networking stack
+
 config INET
 	bool "TCP/IP networking"
 	select CRYPTO
@@ -76,10 +94,63 @@
 
 	  Short answer: say Y.
 
+config BLOG
+	bool "Enable Network Buffer Logging"
+	depends on BCM_KF_BLOG
+	---help---
+	  Debug logging of protocol header information of a network packet
+	  buffer as it traverses the Linux networking stack.
+
+	  Say N unless you wish to debug kernel networking stack.
+
+config BLOG_IPV6
+	bool "Enable Network Buffer Logging of IPv6 packets"
+	depends on BCM_KF_BLOG
+	---help---
+	  Debug logging of IPv6 protocol header information of a network packet
+	  buffer as it traverses the Linux networking stack.
+
+	  Say N unless you wish to debug IPv6 kernel networking stack.
+
+config BLOG_MCAST
+	bool "Enable Network Buffer Logging support for Multicast packets"
+	depends on BCM_KF_BLOG
+	---help---
+	  Debug logging of Multicast packet replication in Linux networking stack.
+
+	  Say N unless you wish to debug Multicast in networking stack.
+
+config BLOG_GRE
+	bool "Enable GRE support"
+	depends on BCM_KF_BLOG
+	---help---
+	  Debug logging of GRE protocol header information of a network packet
+	  buffer as it traverses the Linux networking stack.
+
+	  Say N unless you wish to debug GRE in networking stack.
+
+config BLOG_FEATURE
+	bool "Enable Per Packet Modification support for packet flow"
+	depends on BCM_KF_BLOG
+	---help---
+	  Enhance the flow cache to be able to modify the packets on the fly.
+
+config BLOG_L2TP
+	bool "Enable L2TP support"
+	depends on BCM_KF_BLOG
+	---help---
+	  Debug logging of L2TP protocol header information of a network packet
+	  buffer as it traverses the Linux networking stack.
+
+	  Say N unless you wish to debug l2TP in networking stack.
+
 if INET
 source "net/ipv4/Kconfig"
 source "net/ipv6/Kconfig"
 source "net/netlabel/Kconfig"
+#if defined(CONFIG_BCM_MPTCP) && defined(CONFIG_BCM_KF_MPTCP)
+source "net/mptcp/Kconfig"
+#endif
 
 endif # if INET
 
@@ -217,6 +288,9 @@
 source "net/lapb/Kconfig"
 source "net/phonet/Kconfig"
 source "net/6lowpan/Kconfig"
+if BCM_KF_MHI
+source "net/mhi/Kconfig"
+endif
 source "net/ieee802154/Kconfig"
 source "net/mac802154/Kconfig"
 source "net/sched/Kconfig"
@@ -371,6 +445,16 @@
 source "net/ceph/Kconfig"
 source "net/nfc/Kconfig"
 
+config AVM_SK_TC_INDEX
+	bool "Store tc_index in struct sock"
+	depends on AVM_ENHANCED
+	default y
+	---help---
+	This allows application to store a tc_index in the socket via SIOCSET_TC_INDEX.
+	Skbs arriving on this socket will inherit this.
+	We need this to automatically give voice traffic better priority.
+
+	Say y
 
 endif   # if NET