--- zzzz-none-000/linux-3.10.107/net/Kconfig	2017-06-27 09:49:32.000000000 +0000
+++ vr9-7490-729/linux-3.10.107/net/Kconfig	2021-11-10 11:53:56.000000000 +0000
@@ -23,6 +23,20 @@
 
 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 ETHERNET_PACKET_MANGLE
+	bool
+	help
+	  This option can be selected by phy drivers that need to mangle
+	  packets going in or out of an ethernet device.
+
 config WANT_COMPAT_NETLINK_MESSAGES
 	bool
 	help
@@ -45,6 +59,23 @@
 
 menu "Networking options"
 
+source "net/avm_pa/Kconfig"
+
+config AVM_NET_SKB_INPUT_DEV
+	bool "Store input device in skb"
+	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 NET_DEBUG_SKBUFF_LEAK
+	bool "SKB leak debugging"
+	default n
+	help
+		Track last user of the SKBs, by looking into /proc/skbuff_last_user
+
 source "net/packet/Kconfig"
 source "net/unix/Kconfig"
 source "net/xfrm/Kconfig"
@@ -81,6 +112,14 @@
 
 endif # if INET
 
+config AVM_GENERIC_CONNTRACK
+    bool "Generic connection tracking interface (AVM)"
+    help
+      This allows the use of a connection tracking with
+      a generic interface to access the connection tracking
+      entries. Do not use together with NETFILTER connection
+      tracking.
+
 config NETWORK_SECMARK
 	bool "Security Marking"
 	help
@@ -308,6 +347,10 @@
 
 endmenu
 
+config AVM_NET_LINK_AUDIO
+        tristate "The AVM netlink-audio driver"
+        default n
+
 source "net/ax25/Kconfig"
 source "net/can/Kconfig"
 source "net/irda/Kconfig"
@@ -337,9 +380,30 @@
 source "net/ceph/Kconfig"
 source "net/nfc/Kconfig"
 
+config AVM_SKB_CACHE_SPLIT
+	bool "dedicated skbuff_head_cache for every softirq."
+	depends on AVM_ENHANCED
+	default y
+	---help---
+	  AVM extension
+
+	  softirqs use their own, dedicated skbuff_head_cache (e.g. skbuff_hc_<tasklet_func>). 
+	  This can help to track down "use after free" issues.
+
+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
 
+
 # Used by archs to tell that they support BPF_JIT
 config HAVE_BPF_JIT
 	bool