Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/amd64/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -62,4 +62,4 @@
 CONFIG_MOUNT_DATA = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/arm32/Makefile.config
===================================================================
--- defaults/arm32/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/arm32/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -38,4 +38,4 @@
 CONFIG_MOUNT_DATA = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/ia32/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -68,4 +68,4 @@
 CONFIG_MOUNT_DATA = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/ia64/Makefile.config
===================================================================
--- defaults/ia64/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/ia64/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -50,4 +50,4 @@
 CONFIG_MOUNT_DATA = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/mips32/Makefile.config
===================================================================
--- defaults/mips32/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/mips32/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -44,4 +44,4 @@
 CONFIG_MOUNT_DATA = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/ppc32/Makefile.config
===================================================================
--- defaults/ppc32/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/ppc32/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -44,4 +44,4 @@
 CONFIG_MOUNT_DATA = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/sparc64/Makefile.config
===================================================================
--- defaults/sparc64/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/sparc64/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -62,4 +62,4 @@
 CONFIG_MOUNT_DATA = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n
Index: defaults/special/Makefile.config
===================================================================
--- defaults/special/Makefile.config	(revision 849ed54afbef3ad0ec3af831e93a1353f9eaaf0f)
+++ defaults/special/Makefile.config	(revision 41963042778157d86a3ab7cffe9897ece175627a)
@@ -29,4 +29,4 @@
 CONFIG_START_BD = n
 
-# Default networking architecture
-CONFIG_NETWORKING = modular
+# Bundle netif/nil network layer
+CONFIG_NETIF_NIL_BUNDLE = n