rpms/kernel/FC-5/configs config-generic,1.168,1.168.4.1
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jul 28 21:14:07 UTC 2006
Author: linville
Update of /cvs/dist/rpms/kernel/FC-5/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv22506/configs
Modified Files:
Tag: private-linville-netdev-fc5-7-branch
config-generic
Log Message:
Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/configs/config-generic,v
retrieving revision 1.168
retrieving revision 1.168.4.1
diff -u -r1.168 -r1.168.4.1
--- config-generic 26 Jun 2006 14:36:00 -0000 1.168
+++ config-generic 28 Jul 2006 21:14:05 -0000 1.168.4.1
@@ -638,6 +638,7 @@
CONFIG_DECNET_ROUTE_FWMARK=y
# CONFIG_DECNET_NF_GRABULATOR is not set
CONFIG_BRIDGE=m
+CONFIG_NETWORK_SECMARK=y
CONFIG_NETFILTER=y
CONFIG_NETFILTER_NETLINK=m
CONFIG_NETFILTER_NETLINK_QUEUE=m
@@ -648,6 +649,8 @@
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
@@ -663,9 +666,11 @@
CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_NETFILTER_XT_MATCH_REALM=m
CONFIG_NETFILTER_XT_MATCH_SCTP=m
CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
CONFIG_NETFILTER_XT_MATCH_STRING=m
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -677,21 +682,21 @@
#
CONFIG_IP_NF_CONNTRACK=m
CONFIG_IP_NF_CONNTRACK_MARK=y
+CONFIG_IP_NF_CONNTRACK_SECMARK=y
CONFIG_IP_NF_CONNTRACK_EVENTS=y
CONFIG_IP_NF_CONNTRACK_NETLINK=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_AH_ESP=m
-CONFIG_IP_NF_MATCH_DSCP=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_HASHLIMIT=m
CONFIG_IP_NF_MATCH_IPRANGE=m
CONFIG_IP_NF_MATCH_MULTIPORT=m
-CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_POLICY=m
-CONFIG_IP_NF_MATCH_RECENT=m
CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_MATCH_HASHLIMIT=m
+CONFIG_IP_NF_MATCH_POLICY=m
CONFIG_IP_NF_TARGET_CLUSTERIP=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_REDIRECT=m
@@ -729,22 +734,22 @@
CONFIG_IP_NF_NETBIOS_NS=m
CONFIG_IP_NF_PPTP=m
CONFIG_IP_NF_H323=m
+CONFIG_IP_NF_SIP=m
#
# IPv6: Netfilter Configuration
#
CONFIG_IP6_NF_QUEUE=m
CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_AHESP=m
-CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
CONFIG_IP6_NF_MATCH_FRAG=m
CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
CONFIG_IP6_NF_MATCH_MULTIPORT=m
-CONFIG_IP6_NF_MATCH_OPTS=m
CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
CONFIG_IP6_NF_MATCH_POLICY=m
CONFIG_IP6_NF_FILTER=m
CONFIG_IP6_NF_MANGLE=m
@@ -805,8 +810,8 @@
# CONFIG_ECONET is not set
CONFIG_WAN_ROUTER=m
CONFIG_IP_DCCP=m
-CONFIG_IP_DCCP_CCID2=m
CONFIG_IP_DCCP_CCID3=m
+CONFIG_IP_DCCP_CCID2=m
# CONFIG_IP_DCCP_DEBUG is not set
CONFIG_IP_DCCP_UNLOAD_HACK=y
@@ -861,6 +866,7 @@
# Network testing
#
CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
CONFIG_NETDEVICES=y
#
@@ -923,6 +929,7 @@
CONFIG_QSEMI_PHY=m
CONFIG_LXT_PHY=m
CONFIG_CICADA_PHY=m
+CONFIG_SMSC_PHY=m
CONFIG_MII=m
CONFIG_HAPPYMEAL=m
CONFIG_SUNGEM=m
@@ -946,6 +953,7 @@
CONFIG_DM9102=m
CONFIG_PCMCIA_XIRCOM=m
CONFIG_ULI526X=m
+# CONFIG_AT1700 is not set
# CONFIG_HP100 is not set
CONFIG_LNE390=m
CONFIG_NE3210=m
@@ -1015,6 +1023,7 @@
CONFIG_S2IO=m
CONFIG_S2IO_NAPI=y
CONFIG_CHELSIO_T1=m
+CONFIG_MYRI10GE=m
CONFIG_FDDI=y
# CONFIG_DEFXX is not set
@@ -1040,6 +1049,7 @@
# Wireless LAN (non-hamradio)
#
CONFIG_NET_RADIO=y
+CONFIG_NET_WIRELESS_RTNETLINK=y
#
# Obsolete Wireless cards support (pre-802.11)
@@ -1068,6 +1078,7 @@
# CONFIG_IPW2200 is not set
# CONFIG_IPW2100_DEBUG is not set
# CONFIG_IPW2200_DEBUG is not set
+# CONFIG_IPW_QOS is not set
CONFIG_AIRO=m
CONFIG_HERMES=m
CONFIG_PLX_HERMES=m
@@ -1077,8 +1088,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
@@ -1089,7 +1106,6 @@
CONFIG_PCMCIA_ATMEL=m
CONFIG_PCMCIA_WL3501=m
CONFIG_NET_WIRELESS=y
-CONFIG_NET_WIRELESS_RTNETLINK=y
CONFIG_HOSTAP=m
CONFIG_HOSTAP_PCI=m
@@ -1154,9 +1170,9 @@
CONFIG_ESI_DONGLE=m
CONFIG_ACTISYS_DONGLE=m
CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
CONFIG_IRPORT_SIR=m
# CONFIG_DONGLE_OLD is not set
+CONFIG_TOIM3232_DONGLE=m
CONFIG_LITELINK_DONGLE=m
CONFIG_MA600_DONGLE=m
CONFIG_GIRBIL_DONGLE=m
@@ -1173,6 +1189,7 @@
CONFIG_ALI_FIR=m
CONFIG_VLSI_FIR=m
CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
#
# Bluetooth support
More information about the fedora-cvs-commits
mailing list