[kernel] r5961 - in dists/trunk/linux-2.6/debian: . arch arch/alpha
arch/amd64 arch/arm arch/hppa arch/i386 arch/ia64
arch/powerpc arch/sparc
Frederik Schüler
fs at costa.debian.org
Wed Feb 22 11:43:03 UTC 2006
Author: fs
Date: Wed Feb 22 11:42:58 2006
New Revision: 5961
Modified:
dists/trunk/linux-2.6/debian/arch/alpha/config
dists/trunk/linux-2.6/debian/arch/amd64/config
dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
dists/trunk/linux-2.6/debian/arch/config
dists/trunk/linux-2.6/debian/arch/hppa/config
dists/trunk/linux-2.6/debian/arch/i386/config
dists/trunk/linux-2.6/debian/arch/ia64/config
dists/trunk/linux-2.6/debian/arch/powerpc/config
dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
dists/trunk/linux-2.6/debian/changelog
Log:
Globally enable NAPI on all nic drives supporting it
Globally activate VIDEO_CX88_VP3054
Modified: dists/trunk/linux-2.6/debian/arch/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/arch/alpha/config Wed Feb 22 11:42:58 2006
@@ -541,7 +541,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -564,9 +563,7 @@
CONFIG_NET_PCI=y
CONFIG_PCNET32=m
CONFIG_AMD8111_ETH=m
-CONFIG_AMD8111E_NAPI=y
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
CONFIG_AC3200=m
CONFIG_APRICOT=m
CONFIG_B44=m
@@ -596,21 +593,17 @@
CONFIG_DE620=m
CONFIG_DL2K=m
CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
CONFIG_R8169_VLAN=y
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
CONFIG_2BUFF_MODE=y
CONFIG_TR=y
CONFIG_IBMTR=m
Modified: dists/trunk/linux-2.6/debian/arch/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/config Wed Feb 22 11:42:58 2006
@@ -526,7 +526,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -535,9 +534,7 @@
CONFIG_NET_PCI=y
CONFIG_PCNET32=m
CONFIG_AMD8111_ETH=m
-# CONFIG_AMD8111E_NAPI is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
CONFIG_B44=m
CONFIG_FORCEDETH=m
CONFIG_EEPRO100=m
@@ -559,20 +556,16 @@
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_DL2K=m
CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
# CONFIG_2BUFF_MODE is not set
CONFIG_TR=y
CONFIG_IBMOL=m
Modified: dists/trunk/linux-2.6/debian/arch/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/arch/arm/config.footbridge Wed Feb 22 11:42:58 2006
@@ -641,7 +641,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -1551,7 +1550,6 @@
CONFIG_BLK_DEV_TRIFLEX=m
CONFIG_BT_BNEP_PROTO_FILTER=y
# CONFIG_USB_ZD1201 is not set
-# CONFIG_R8169_NAPI is not set
# CONFIG_BLK_DEV_DTC2278 is not set
# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
# CONFIG_SCSI_CPQFCTS is not set
@@ -1610,7 +1608,6 @@
# CONFIG_IDEDMA_IVB is not set
CONFIG_LOGO_LINUX_MONO=y
# CONFIG_BLK_DEV_ALI14XX is not set
-# CONFIG_E1000_NAPI is not set
# CONFIG_PCMCIA_QLOGIC is not set
CONFIG_BLK_DEV_CS5530=m
# CONFIG_FTL is not set
Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config (original)
+++ dists/trunk/linux-2.6/debian/arch/config Wed Feb 22 11:42:58 2006
@@ -800,3 +800,12 @@
CONFIG_EXT3_FS_SECURITY=y
# CONFIG_XFS_RT is not set
CONFIG_XFS_SECURITY=y
+CONFIG_AMD8111E_NAPI=y
+CONFIG_TULIP_NAPI=y
+CONFIG_R8169_NAPI=y
+CONFIG_IXGB_NAPI=y
+CONFIG_ADAPTEC_STARFIRE_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_E1000_NAPI=y
+CONFIG_S2IO_NAPI=y
+CONFIG_VIDEO_CX88_VP3054=m
Modified: dists/trunk/linux-2.6/debian/arch/hppa/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/hppa/config (original)
+++ dists/trunk/linux-2.6/debian/arch/hppa/config Wed Feb 22 11:42:58 2006
@@ -343,7 +343,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
# CONFIG_DE4X5 is not set
# CONFIG_WINBOND_840 is not set
# CONFIG_DM9102 is not set
@@ -366,9 +365,7 @@
CONFIG_NET_PCI=y
CONFIG_PCNET32=m
CONFIG_AMD8111_ETH=m
-# CONFIG_AMD8111E_NAPI is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
CONFIG_AC3200=m
CONFIG_APRICOT=m
CONFIG_B44=m
@@ -396,21 +393,17 @@
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_DL2K=m
CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
CONFIG_R8169_VLAN=y
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
# CONFIG_2BUFF_MODE is not set
# CONFIG_TR is not set
CONFIG_NET_RADIO=y
Modified: dists/trunk/linux-2.6/debian/arch/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/i386/config (original)
+++ dists/trunk/linux-2.6/debian/arch/i386/config Wed Feb 22 11:42:58 2006
@@ -637,7 +637,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -660,9 +659,7 @@
CONFIG_NET_PCI=y
CONFIG_PCNET32=m
CONFIG_AMD8111_ETH=m
-# CONFIG_AMD8111E_NAPI is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
CONFIG_AC3200=m
CONFIG_APRICOT=m
CONFIG_B44=m
@@ -691,21 +688,17 @@
CONFIG_DE620=m
CONFIG_DL2K=m
CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
CONFIG_R8169_VLAN=y
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
# CONFIG_2BUFF_MODE is not set
CONFIG_TR=y
CONFIG_IBMTR=m
Modified: dists/trunk/linux-2.6/debian/arch/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/arch/ia64/config Wed Feb 22 11:42:58 2006
@@ -471,7 +471,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
# CONFIG_DE4X5 is not set
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -480,9 +479,7 @@
CONFIG_NET_PCI=y
CONFIG_PCNET32=m
CONFIG_AMD8111_ETH=m
-# CONFIG_AMD8111E_NAPI is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
CONFIG_B44=m
CONFIG_FORCEDETH=m
CONFIG_EEPRO100=m
@@ -504,21 +501,17 @@
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_DL2K=m
CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
CONFIG_R8169_VLAN=y
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_BNX2=m
CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
# CONFIG_2BUFF_MODE is not set
CONFIG_TR=y
CONFIG_IBMOL=m
Modified: dists/trunk/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/powerpc/config (original)
+++ dists/trunk/linux-2.6/debian/arch/powerpc/config Wed Feb 22 11:42:58 2006
@@ -406,7 +406,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
CONFIG_DE4X5=m
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -416,7 +415,6 @@
CONFIG_PCNET32=m
# CONFIG_AMD8111_ETH is not set
CONFIG_ADAPTEC_STARFIRE=m
-# CONFIG_ADAPTEC_STARFIRE_NAPI is not set
CONFIG_B44=m
# CONFIG_FORCEDETH is not set
CONFIG_EEPRO100=m
@@ -439,12 +437,10 @@
CONFIG_VIA_RHINE_MMIO=y
CONFIG_DL2K=m
CONFIG_E1000=m
-# CONFIG_E1000_NAPI is not set
CONFIG_NS83820=m
CONFIG_HAMACHI=m
CONFIG_YELLOWFIN=m
CONFIG_R8169=m
-# CONFIG_R8169_NAPI is not set
CONFIG_R8169_VLAN=y
CONFIG_SK98LIN=m
CONFIG_VIA_VELOCITY=m
@@ -455,9 +451,7 @@
CONFIG_MV643XX_ETH_1=y
# CONFIG_MV643XX_ETH_2 is not set
CONFIG_IXGB=m
-# CONFIG_IXGB_NAPI is not set
CONFIG_S2IO=m
-# CONFIG_S2IO_NAPI is not set
# CONFIG_2BUFF_MODE is not set
CONFIG_TR=y
CONFIG_IBMOL=m
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64 (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64 Wed Feb 22 11:42:58 2006
@@ -150,8 +150,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
# CONFIG_DE4X5 is not set
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -159,7 +157,6 @@
CONFIG_PCNET32=m
# CONFIG_AMD8111_ETH is not set
CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
CONFIG_B44=m
# CONFIG_FORCEDETH is not set
# CONFIG_EEPRO100 is not set
@@ -181,7 +178,6 @@
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_DL2K=m
CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
CONFIG_MYRI_SBUS=m
CONFIG_NS83820=m
CONFIG_YELLOWFIN=m
@@ -189,9 +185,7 @@
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
# CONFIG_2BUFF_MODE is not set
CONFIG_FDDI=y
# CONFIG_DEFXX is not set
Modified: dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp (original)
+++ dists/trunk/linux-2.6/debian/arch/sparc/config.sparc64-smp Wed Feb 22 11:42:58 2006
@@ -154,8 +154,6 @@
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
-CONFIG_TULIP_NAPI=y
-CONFIG_TULIP_NAPI_HW_MITIGATION=y
# CONFIG_DE4X5 is not set
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
@@ -163,7 +161,6 @@
CONFIG_PCNET32=m
# CONFIG_AMD8111_ETH is not set
CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADAPTEC_STARFIRE_NAPI=y
CONFIG_B44=m
# CONFIG_FORCEDETH is not set
# CONFIG_EEPRO100 is not set
@@ -185,7 +182,6 @@
# CONFIG_VIA_RHINE_MMIO is not set
CONFIG_DL2K=m
CONFIG_E1000=m
-CONFIG_E1000_NAPI=y
CONFIG_MYRI_SBUS=m
CONFIG_NS83820=m
CONFIG_YELLOWFIN=m
@@ -193,9 +189,7 @@
CONFIG_VIA_VELOCITY=m
CONFIG_TIGON3=m
CONFIG_IXGB=m
-CONFIG_IXGB_NAPI=y
CONFIG_S2IO=m
-CONFIG_S2IO_NAPI=y
# CONFIG_2BUFF_MODE is not set
CONFIG_FDDI=y
# CONFIG_DEFXX is not set
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Wed Feb 22 11:42:58 2006
@@ -4,6 +4,7 @@
* New upstream release.
* Activate CONFIG_DVB_AV7110_OSD on alpha amd64 and ia64.
Closes: #353292
+ * Glovally activate NAPI on all network card drivers which support it.
[ maximilian attems ]
* Drop fdutils from i386 and amd64 Suggests.
More information about the Kernel-svn-changes
mailing list