[LV-kern-commit] CVS: kernel-2.4/net Config.in,1.1.1.2,1.2 Makefile,1.1.1.1,1.2 README,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/net
In directory usw-pr-cvs1:/tmp/cvs-serv30559

Modified Files:
	Config.in Makefile README 
Log Message:
synch 2.4.15 commit 18


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/Config.in,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- Config.in	25 Feb 2001 23:14:55 -0000	1.1.1.2
+++ Config.in	9 Apr 2002 16:20:44 -0000	1.2
@@ -46,6 +46,9 @@
 	 tristate '    Multi-Protocol Over ATM (MPOA) support' CONFIG_ATM_MPOA
       fi
    fi
+
+   dep_tristate '802.1Q VLAN Support (EXPERIMENTAL)' CONFIG_VLAN_8021Q $CONFIG_EXPERIMENTAL
+
 fi
 
 comment ' '
@@ -81,7 +84,7 @@
 
 mainmenu_option next_comment
 comment 'QoS and/or fair queueing'
-bool 'QoS and/or fair queueing (EXPERIMENTAL)' CONFIG_NET_SCHED
+bool 'QoS and/or fair queueing' CONFIG_NET_SCHED
 if [ "$CONFIG_NET_SCHED" = "y" ]; then
    source net/sched/Config.in
 fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	14 Jan 2001 17:06:51 -0000	1.1.1.1
+++ Makefile	9 Apr 2002 16:20:44 -0000	1.2
@@ -7,7 +7,7 @@
 
 O_TARGET :=	network.o
 
-mod-subdirs :=	ipv4/netfilter ipv6/netfilter ipx irda atm netlink sched
+mod-subdirs :=	ipv4/netfilter ipv6/netfilter ipx irda bluetooth atm netlink sched
 export-objs :=	netsyms.o
 
 subdir-y :=	core ethernet
@@ -40,10 +40,12 @@
 subdir-$(CONFIG_ROSE)		+= rose
 subdir-$(CONFIG_AX25)		+= ax25
 subdir-$(CONFIG_IRDA)		+= irda
+subdir-$(CONFIG_BLUEZ)		+= bluetooth
 subdir-$(CONFIG_SUNRPC)		+= sunrpc
 subdir-$(CONFIG_ATM)		+= atm
 subdir-$(CONFIG_DECNET)		+= decnet
 subdir-$(CONFIG_ECONET)		+= econet
+subdir-$(CONFIG_VLAN_8021Q)           += 8021q
 
 
 obj-y	:= socket.o $(join $(subdir-y), $(patsubst %,/%.o,$(notdir $(subdir-y))))

Index: README
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- README	14 Jan 2001 17:06:59 -0000	1.1.1.1
+++ README	9 Apr 2002 16:20:44 -0000	1.2
@@ -5,7 +5,7 @@
 -------------------+-------------------------------------------
 802 [other	]	al...@lx...	
     [token ring	]	p.n...@co...
-appletalk		js...@tu...
+appletalk		js...@sa...
 ax25			g4...@g4...
 bridge			bu...@gn...
 core			al...@lx...
@@ -13,7 +13,8 @@
 ethernet		al...@lx...
 ipv4			da...@ca...,Eri...@dn...
 ipv6			da...@ca...,Eri...@dn...
-ipx/spx			js...@tu...
+ipx			ac...@co...
+spx			js...@sa...
 irda                    da...@cs...
 lapb			g4...@g4...
 netrom			g4...@g4...
@@ -21,5 +22,5 @@
 wanrouter		ge...@co..., jaspreet@sangoma and dm...@sa...
 unix			al...@lx...
 x25			g4...@g4...
-
+bluetooth		ma...@qu...