patch-2.3.47 linux/net/Config.in

Next file: linux/net/Makefile
Previous file: linux/net/Changes
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.46/linux/net/Config.in linux/net/Config.in
@@ -61,11 +61,8 @@
    fi
    tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25
    tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB
-   bool 'Bridging (EXPERIMENTAL)' CONFIG_BRIDGE
-   if [ "$CONFIG_BRIDGE" != "n" ]; then
-       int '  Maximum number of bridged interfaces' CONFIG_BRIDGE_NUM_PORTS 8
-   fi
-bool '802.2 LLC (EXPERIMENTAL)' CONFIG_LLC
+   tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE
+   bool '802.2 LLC (EXPERIMENTAL)' CONFIG_LLC
 #   if [ "$CONFIG_LLC" = "y" ]; then
 #      bool '  Netbeui (EXPERIMENTAL)' CONFIG_NETBEUI
 #   fi

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)