rpms/kernel/FC-5/configs config-generic,1.183,1.183.2.1

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv16460/configs

Modified Files:
      Tag: private-linville-netdev-fc5-14-branch
	config-generic 
Log Message:



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.183
retrieving revision 1.183.2.1
diff -u -r1.183 -r1.183.2.1
--- config-generic	10 Nov 2006 17:19:29 -0000	1.183
+++ config-generic	27 Nov 2006 20:29:02 -0000	1.183.2.1
@@ -638,7 +638,12 @@
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=y
+CONFIG_IPV6_SIT=m
 CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_ROUTE_FWMARK=y
 CONFIG_DECNET=m
 CONFIG_DECNET_ROUTER=y
 CONFIG_DECNET_ROUTE_FWMARK=y
@@ -652,6 +657,7 @@
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
 CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
@@ -661,6 +667,7 @@
 CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
 CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
 CONFIG_NETFILTER_XT_MATCH_ESP=m
 CONFIG_NETFILTER_XT_MATCH_HELPER=m
 CONFIG_NETFILTER_XT_MATCH_LENGTH=m
@@ -784,10 +791,12 @@
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=y
+CONFIG_XFRM_SUB_POLICY=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
 CONFIG_INET_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 
 #
 # SCTP Configuration (EXPERIMENTAL)
@@ -818,6 +827,8 @@
 CONFIG_IP_DCCP_CCID2=m
 CONFIG_IP_DCCP_CCID3=m
 # CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
 
 #
 # TIPC Configuration (EXPERIMENTAL)
@@ -945,6 +956,7 @@
 CONFIG_LXT_PHY=m
 CONFIG_CICADA_PHY=m
 CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
 CONFIG_FIXED_PHY=m
 CONFIG_FIXED_MII_10_FDX=y
 CONFIG_FIXED_MII_100_FDX=y
@@ -978,6 +990,7 @@
 CONFIG_ES3210=m
 CONFIG_NET_PCI=y
 CONFIG_PCNET32=m
+CONFIG_PCNET32_NAPI=y
 CONFIG_AMD8111_ETH=m
 CONFIG_AMD8111E_NAPI=y
 CONFIG_ADAPTEC_STARFIRE=m
@@ -1033,6 +1046,7 @@
 CONFIG_SKGE=m
 CONFIG_TIGON3=m
 CONFIG_SKY2=m
+CONFIG_QLA3XXX=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1042,6 +1056,7 @@
 CONFIG_S2IO=m
 CONFIG_S2IO_NAPI=y
 CONFIG_MYRI10GE=m
+CONFIG_NETXEN_NIC=m
 CONFIG_CHELSIO_T1=m
 
 CONFIG_FDDI=y
@@ -1108,8 +1123,14 @@
 CONFIG_ATMEL=m
 CONFIG_PCI_ATMEL=m
 CONFIG_PRISM54=m
+CONFIG_PRISM54_USB=m
 CONFIG_BCM43XX=m
 CONFIG_BCM43XX_DEBUG=y
+CONFIG_ADM8211=m
+CONFIG_ACX_PCI=m
+CONFIG_ACX_USB=m
+CONFIG_ZD1211RW=m
+CONFIG_ZD1211RW_DEBUG=y
 
 #
 # Wireless 802.11b Pcmcia/Cardbus cards support