Hello community,
here is the log from the commit of package kernel-source
checked in at Wed Oct 31 12:37:16 CET 2007.
--------
--- kernel-source/kernel-debug.changes 2007-10-25 12:18:16.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2007-10-31 08:03:14.000000000 +0100
@@ -1,0 +2,29 @@
+Mon Oct 29 22:59:41 CET 2007 - jeffm@suse.de
+
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+
+-------------------------------------------------------------------
+Fri Oct 26 14:58:23 CEST 2007 - jeffm@suse.de
+
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+
+-------------------------------------------------------------------
+Fri Oct 26 13:43:20 CEST 2007 - bwalle@suse.de
+
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+
+-------------------------------------------------------------------
+Thu Oct 25 22:02:09 CEST 2007 - philips@suse.de
+
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+
+-------------------------------------------------------------------
+Thu Oct 25 20:36:52 CEST 2007 - jeffm@suse.de
+
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-rt.changes: same change
kernel-rt_debug.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
kernel-xenpae.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:05.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:05.000000000 +0100
@@ -39,7 +39,7 @@
%endif
Summary: A Debug Version of the Kernel
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -174,7 +174,7 @@
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -559,6 +559,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
kernel-default.spec: same change
++++++ kernel-dummy.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100
@@ -15,7 +15,7 @@
Url: http://www.kernel.org/
Summary: Internal dummy package for synchronizing release numbers
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: off
@@ -28,7 +28,7 @@
--------
Andreas Gruenbacher
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%install
rm -rf %buildroot
@@ -39,6 +39,20 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100
@@ -39,7 +39,7 @@
%endif
Summary: kernel for kdump
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -173,7 +173,7 @@
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -558,6 +558,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
kernel-pae.spec: same change
++++++ kernel-ppc64.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100
@@ -38,8 +38,8 @@
%endif
Summary: Kernel for ppc64 Systems
Version: 2.6.23.1
-Release: 7
-License: GPL v2 or later; LGPL v2 or later
+Release: 9
+License: GPL v2 or later; LGPL v2.1 or later
Group: System/Kernel
AutoReqProv: on
BuildRequires: coreutils module-init-tools
@@ -185,7 +185,7 @@
Tom Gall
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -570,6 +570,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-rt_debug.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:06.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:06.000000000 +0100
@@ -39,7 +39,7 @@
%endif
Summary: A Debug Version of the Kernel
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -171,7 +171,7 @@
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -556,6 +556,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-rt.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100
@@ -39,7 +39,7 @@
%endif
Summary: The Realtime Linux Kernel
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -176,7 +176,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -561,6 +561,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-s390.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100
@@ -39,7 +39,7 @@
%endif
Summary: The Standard Kernel
Version: 2.6.23.1
-Release: 4
+Release: 5
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -167,7 +167,7 @@
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -552,6 +552,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-source.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100
@@ -22,7 +22,7 @@
%endif
Summary: The Linux Kernel Sources
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 only
Group: Development/Sources
AutoReqProv: off
@@ -105,7 +105,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -277,6 +277,20 @@
%files -f kernel-source.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-syms.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100
@@ -21,7 +21,7 @@
%endif
Summary: Kernel Symbol Versions (modversions)
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 or later
Group: Development/Sources
AutoReqProv: off
@@ -95,7 +95,7 @@
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
echo "Architecture symbol(s):" %symbols
@@ -149,6 +149,20 @@
/boot/symsets-*-*.tar.gz
/lib/modules/*/build
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-vanilla.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:07.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:07.000000000 +0100
@@ -39,7 +39,7 @@
%endif
Summary: The Standard Kernel - without any SUSE patches
Version: 2.6.23.1
-Release: 7
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -187,7 +187,7 @@
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -572,6 +572,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
++++++ kernel-xenpae.spec ++++++
--- /var/tmp/diff_new_pack.q26806/_old 2007-10-31 12:32:08.000000000 +0100
+++ /var/tmp/diff_new_pack.q26806/_new 2007-10-31 12:32:08.000000000 +0100
@@ -39,7 +39,7 @@
%endif
Summary: The Xen Kernel with PAE support
Version: 2.6.23.1
-Release: 1
+Release: 9
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -170,7 +170,7 @@
-Source Timestamp: 2007/10/25 08:51:03 UTC
+Source Timestamp: 2007/10/29 21:58:23 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.23.tar.bz2 ]; then
@@ -555,6 +555,20 @@
%files -f kernel.files
%changelog
+* Mon Oct 29 2007 - jeffm@suse.de
+- patches.fixes/proc-scsi-scsi-fix.diff: scsi: iterate over
+ devices individually for /proc/scsi/scsi (263731).
+* Fri Oct 26 2007 - jeffm@suse.de
+- Update config files: Missed CONFIG_PRINTK_TIME on x86_64-xen
+* Fri Oct 26 2007 - bwalle@suse.de
+- patches.fixes/remove-transparent-bridge-sizing:
+ PCI: remove transparent bridge sizing (331027).
+* Thu Oct 25 2007 - philips@suse.de
+- patches.drivers/e1000e.patch: update to the latest version in
+ 2.6.24-rc1
+* Thu Oct 25 2007 - jeffm@suse.de
+- Update config files: Enable printk timestamping. It can be disabled
+ at boot time with printk.time=0.
* Thu Oct 25 2007 - jbeulich@novell.com
- patches.fixes/rename-TSS_sysenter_esp0-SYSENTER_stack_esp0.patch:
Delete.
kernel-xen.spec: same change
++++++ build-source-timestamp ++++++
--- kernel-source/build-source-timestamp 2007-10-25 12:18:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/build-source-timestamp 2007-10-31 08:03:08.000000000 +0100
@@ -1 +1 @@
-2007/10/25 08:51:03 UTC
+2007/10/29 21:58:23 UTC
++++++ config.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/default new/config/alpha/default
--- old/config/alpha/default 2007-10-17 23:02:43.000000000 +0200
+++ new/config/alpha/default 2007-10-26 09:13:27.000000000 +0200
@@ -3308,7 +3308,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3422,3 +3421,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/alpha/vanilla new/config/alpha/vanilla
--- old/config/alpha/vanilla 2007-10-14 07:19:05.000000000 +0200
+++ new/config/alpha/vanilla 2007-10-26 09:13:27.000000000 +0200
@@ -3217,7 +3217,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3328,3 +3327,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/debug new/config/i386/debug
--- old/config/i386/debug 2007-10-25 12:17:23.000000000 +0200
+++ new/config/i386/debug 2007-10-26 09:13:27.000000000 +0200
@@ -3694,7 +3694,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3843,3 +3842,4 @@
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/default new/config/i386/default
--- old/config/i386/default 2007-10-25 12:17:23.000000000 +0200
+++ new/config/i386/default 2007-10-26 09:13:27.000000000 +0200
@@ -3698,7 +3698,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3842,3 +3841,4 @@
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/pae new/config/i386/pae
--- old/config/i386/pae 2007-10-25 12:17:25.000000000 +0200
+++ new/config/i386/pae 2007-10-26 09:13:27.000000000 +0200
@@ -3696,7 +3696,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3840,3 +3839,4 @@
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/rt new/config/i386/rt
--- old/config/i386/rt 2007-10-19 12:06:49.000000000 +0200
+++ new/config/i386/rt 2007-10-26 09:13:27.000000000 +0200
@@ -3719,7 +3719,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3871,3 +3870,4 @@
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/rt_debug new/config/i386/rt_debug
--- old/config/i386/rt_debug 2007-10-19 12:06:49.000000000 +0200
+++ new/config/i386/rt_debug 2007-10-26 09:13:27.000000000 +0200
@@ -3713,7 +3713,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3876,3 +3875,4 @@
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/vanilla new/config/i386/vanilla
--- old/config/i386/vanilla 2007-10-16 08:01:12.000000000 +0200
+++ new/config/i386/vanilla 2007-10-26 09:13:27.000000000 +0200
@@ -3661,7 +3661,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3803,3 +3802,4 @@
CONFIG_X86_BIOS_REBOOT=y
CONFIG_X86_TRAMPOLINE=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xen new/config/i386/xen
--- old/config/i386/xen 2007-10-25 12:17:25.000000000 +0200
+++ new/config/i386/xen 2007-10-26 09:13:27.000000000 +0200
@@ -3424,7 +3424,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3605,3 +3604,4 @@
CONFIG_X86_NO_TSS=y
CONFIG_X86_NO_IDT=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/i386/xenpae new/config/i386/xenpae
--- old/config/i386/xenpae 2007-10-25 12:17:25.000000000 +0200
+++ new/config/i386/xenpae 2007-10-26 09:13:27.000000000 +0200
@@ -3426,7 +3426,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3607,3 +3606,4 @@
CONFIG_X86_NO_TSS=y
CONFIG_X86_NO_IDT=y
CONFIG_KTIME_SCALAR=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/debug new/config/ia64/debug
--- old/config/ia64/debug 2007-10-17 23:02:43.000000000 +0200
+++ new/config/ia64/debug 2007-10-26 09:13:27.000000000 +0200
@@ -3159,7 +3159,6 @@
#
# Kernel hacking
#
-CONFIG_PRINTK_TIME=y
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3258,3 +3257,4 @@
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/default new/config/ia64/default
--- old/config/ia64/default 2007-10-17 23:02:43.000000000 +0200
+++ new/config/ia64/default 2007-10-26 09:13:27.000000000 +0200
@@ -3156,7 +3156,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3254,3 +3253,4 @@
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/ia64/vanilla new/config/ia64/vanilla
--- old/config/ia64/vanilla 2007-10-14 07:19:06.000000000 +0200
+++ new/config/ia64/vanilla 2007-10-26 09:13:27.000000000 +0200
@@ -3109,7 +3109,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3200,3 +3199,4 @@
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/default new/config/powerpc/default
--- old/config/powerpc/default 2007-10-17 23:02:43.000000000 +0200
+++ new/config/powerpc/default 2007-10-26 09:13:27.000000000 +0200
@@ -2728,7 +2728,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -2828,3 +2827,4 @@
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/kdump new/config/powerpc/kdump
--- old/config/powerpc/kdump 2007-10-14 07:19:06.000000000 +0200
+++ new/config/powerpc/kdump 2007-10-26 09:13:27.000000000 +0200
@@ -2030,7 +2030,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -2131,3 +2130,4 @@
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/ppc64 new/config/powerpc/ppc64
--- old/config/powerpc/ppc64 2007-10-14 07:19:06.000000000 +0200
+++ new/config/powerpc/ppc64 2007-10-26 09:13:27.000000000 +0200
@@ -2524,7 +2524,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -2626,3 +2625,4 @@
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/powerpc/vanilla new/config/powerpc/vanilla
--- old/config/powerpc/vanilla 2007-10-14 07:19:06.000000000 +0200
+++ new/config/powerpc/vanilla 2007-10-26 09:13:27.000000000 +0200
@@ -2580,7 +2580,6 @@
#
# Kernel hacking
#
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -2679,3 +2678,4 @@
CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_HW=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default
--- old/config/s390/default 2007-10-14 07:19:06.000000000 +0200
+++ new/config/s390/default 2007-10-26 09:13:27.000000000 +0200
@@ -1001,7 +1001,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -1112,3 +1111,4 @@
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_PLIST=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390
--- old/config/s390/s390 2007-10-14 07:19:06.000000000 +0200
+++ new/config/s390/s390 2007-10-26 09:13:27.000000000 +0200
@@ -1000,7 +1000,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -1111,3 +1110,4 @@
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_PLIST=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/vanilla new/config/s390/vanilla
--- old/config/s390/vanilla 2007-10-14 07:19:06.000000000 +0200
+++ new/config/s390/vanilla 2007-10-26 09:13:27.000000000 +0200
@@ -996,7 +996,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -1106,3 +1105,4 @@
CONFIG_TEXTSEARCH_BM=m
CONFIG_TEXTSEARCH_FSM=m
CONFIG_PLIST=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/debug new/config/x86_64/debug
--- old/config/x86_64/debug 2007-10-25 12:17:26.000000000 +0200
+++ new/config/x86_64/debug 2007-10-26 09:13:27.000000000 +0200
@@ -3372,7 +3372,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3499,3 +3498,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/default new/config/x86_64/default
--- old/config/x86_64/default 2007-10-25 12:17:26.000000000 +0200
+++ new/config/x86_64/default 2007-10-26 09:13:27.000000000 +0200
@@ -3380,7 +3380,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3502,3 +3501,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/rt new/config/x86_64/rt
--- old/config/x86_64/rt 2007-10-19 12:06:49.000000000 +0200
+++ new/config/x86_64/rt 2007-10-26 09:13:27.000000000 +0200
@@ -3411,7 +3411,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3540,3 +3539,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/rt_debug new/config/x86_64/rt_debug
--- old/config/x86_64/rt_debug 2007-10-19 12:06:49.000000000 +0200
+++ new/config/x86_64/rt_debug 2007-10-26 09:13:27.000000000 +0200
@@ -3403,7 +3403,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3543,3 +3542,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/vanilla new/config/x86_64/vanilla
--- old/config/x86_64/vanilla 2007-10-16 08:01:12.000000000 +0200
+++ new/config/x86_64/vanilla 2007-10-26 09:13:27.000000000 +0200
@@ -3340,7 +3340,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3460,3 +3459,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/x86_64/xen new/config/x86_64/xen
--- old/config/x86_64/xen 2007-10-25 12:17:26.000000000 +0200
+++ new/config/x86_64/xen 2007-10-26 18:02:27.000000000 +0200
@@ -3312,7 +3312,6 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_MAGIC_SYSRQ=y
# CONFIG_UNUSED_SYMBOLS is not set
@@ -3474,3 +3473,4 @@
CONFIG_HAS_IOPORT=y
CONFIG_HAS_DMA=y
CONFIG_CHECK_SIGNATURE=y
+CONFIG_PRINTK_TIME=y
++++++ needed_space_in_mb ++++++
--- kernel-source/needed_space_in_mb 2007-10-26 01:54:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/needed_space_in_mb 2007-10-31 08:03:29.000000000 +0100
@@ -1 +1 @@
-6000
+6144
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/e1000e.patch new/patches.drivers/e1000e.patch
--- old/patches.drivers/e1000e.patch 2007-08-27 21:42:57.000000000 +0200
+++ new/patches.drivers/e1000e.patch 2007-10-26 09:13:28.000000000 +0200
@@ -1,6 +1,6 @@
From: Brandon Philips
Subject: [Backport] e1000e: pci-express e1000 driver (currently ICH9 only)
-Patch-mainline: -mm expected 2.6.24
+Patch-mainline: 2.6.24
References: FATE 302349
GIT: linux/kernel/git/jgarzik/netdev-2.6.git#e1000e
@@ -12,66 +12,24 @@
Signed-off-by: Jeff Garzik
---
- drivers/net/Kconfig | 23
- drivers/net/Makefile | 1
drivers/net/e1000e/82571.c | 1351 +++++++++++++
drivers/net/e1000e/Makefile | 37
- drivers/net/e1000e/defines.h | 737 +++++++
- drivers/net/e1000e/e1000.h | 519 +++++
+ drivers/net/e1000e/defines.h | 739 +++++++
+ drivers/net/e1000e/e1000.h | 514 ++++
drivers/net/e1000e/es2lan.c | 1232 +++++++++++
- drivers/net/e1000e/ethtool.c | 1774 +++++++++++++++++
+ drivers/net/e1000e/ethtool.c | 1791 +++++++++++++++++
drivers/net/e1000e/hw.h | 864 ++++++++
drivers/net/e1000e/ich8lan.c | 2225 +++++++++++++++++++++
- drivers/net/e1000e/lib.c | 2466 +++++++++++++++++++++++
- drivers/net/e1000e/netdev.c | 4460 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/net/e1000e/lib.c | 2493 ++++++++++++++++++++++++
+ drivers/net/e1000e/netdev.c | 4438 +++++++++++++++++++++++++++++++++++++++++++
drivers/net/e1000e/param.c | 382 +++
drivers/net/e1000e/phy.c | 1773 +++++++++++++++++
- 14 files changed, 17844 insertions(+)
+ 12 files changed, 17839 insertions(+)
---- a/drivers/net/Kconfig 2007-08-27 14:01:21.000000000 -0400
-+++ b/drivers/net/Kconfig 2007-08-27 14:01:22.000000000 -0400
-@@ -1994,6 +1994,29 @@ config E1000_DISABLE_PACKET_SPLIT
-
- If in doubt, say N.
-
-+config E1000E
-+ tristate "Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support"
-+ depends on PCI
-+ ---help---
-+ This driver supports the PCI-Express Intel(R) PRO/1000 gigabit
-+ ethernet family of adapters. For PCI or PCI-X e1000 adapters,
-+ use the regular e1000 driver For more information on how to
-+ identify your adapter, go to the Adapter & Driver ID Guide at:
-+
-+ http://support.intel.com/support/network/adapter/pro100/21397.htm
-+
-+ For general information and support, go to the Intel support
-+ website at:
-+
-+ http://support.intel.com
-+
-+ More specific information on configuring the driver is in
-+ file:Documentation/networking/e1000e.txt.
-+
-+ To compile this driver as a module, choose M here and read
-+ file:Documentation/networking/net-modules.txt. The module
-+ will be called e1000e.
-+
- source "drivers/net/ixp2000/Kconfig"
-
- config MYRI_SBUS
---- a/drivers/net/Makefile 2007-08-27 14:01:21.000000000 -0400
-+++ b/drivers/net/Makefile 2007-08-27 14:01:22.000000000 -0400
-@@ -3,6 +3,7 @@
- #
-
- obj-$(CONFIG_E1000) += e1000/
-+obj-$(CONFIG_E1000E) += e1000e/
- obj-$(CONFIG_IBM_EMAC) += ibm_emac/
- obj-$(CONFIG_IXGB) += ixgb/
- obj-$(CONFIG_CHELSIO_T1) += chelsio/
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/82571.c 2007-08-27 14:01:22.000000000 -0400
+Index: linux-2.6.23/drivers/net/e1000e/82571.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/82571.c
@@ -0,0 +1,1351 @@
+/*******************************************************************************
+
@@ -1424,8 +1382,10 @@
+ .nvm_ops = &e82573_nvm_ops,
+};
+
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/Makefile 2007-08-27 14:01:22.000000000 -0400
+Index: linux-2.6.23/drivers/net/e1000e/Makefile
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/Makefile
@@ -0,0 +1,37 @@
+################################################################################
+#
@@ -1464,9 +1424,11 @@
+e1000e-objs := 82571.o ich8lan.o es2lan.o \
+ lib.o phy.o param.o ethtool.o netdev.o
+
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/defines.h 2007-08-27 14:01:22.000000000 -0400
-@@ -0,0 +1,737 @@
+Index: linux-2.6.23/drivers/net/e1000e/defines.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/defines.h
+@@ -0,0 +1,739 @@
+/*******************************************************************************
+
+ Intel PRO/1000 Linux driver
@@ -2042,9 +2004,11 @@
+/* For checksumming, the sum of all words in the NVM should equal 0xBABA. */
+#define NVM_SUM 0xBABA
+
-+#define NVM_WORD_SIZE_BASE_SHIFT 6
++/* PBA (printed board assembly) number words */
++#define NVM_PBA_OFFSET_0 8
++#define NVM_PBA_OFFSET_1 9
+
-+/* NVM Commands - Microwire */
++#define NVM_WORD_SIZE_BASE_SHIFT 6
+
+/* NVM Commands - SPI */
+#define NVM_MAX_RETRY_SPI 5000 /* Max wait of 5ms, for RDY signal */
@@ -2204,9 +2168,11 @@
+#define E1000_GEN_POLL_TIMEOUT 640
+
+#endif /* _E1000_DEFINES_H_ */
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/e1000.h 2007-08-27 14:01:22.000000000 -0400
-@@ -0,0 +1,519 @@
+Index: linux-2.6.23/drivers/net/e1000e/e1000.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/e1000.h
+@@ -0,0 +1,514 @@
+/*******************************************************************************
+
+ Intel PRO/1000 Linux driver
@@ -2351,18 +2317,9 @@
+ /* array of buffer information structs */
+ struct e1000_buffer *buffer_info;
+
-+ union {
-+ /* for TX */
-+ struct {
-+ bool last_tx_tso; /* used to mark tso desc. */
-+ };
-+ /* for RX */
-+ struct {
-+ /* arrays of page information for packet split */
-+ struct e1000_ps_page *ps_pages;
-+ struct sk_buff *rx_skb_top;
-+ };
-+ };
++ /* arrays of page information for packet split */
++ struct e1000_ps_page *ps_pages;
++ struct sk_buff *rx_skb_top;
+
+ struct e1000_queue_stats stats;
+};
@@ -2405,6 +2362,8 @@
+ struct e1000_ring *tx_ring /* One per active queue */
+ ____cacheline_aligned_in_smp;
+
++ struct napi_struct napi;
++
+ unsigned long tx_queue_len;
+ unsigned int restart_queue;
+ u32 txd_cmd;
@@ -2576,6 +2535,8 @@
+extern struct e1000_info e1000_ich9_info;
+extern struct e1000_info e1000_es2_info;
+
++extern s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num);
++
+extern s32 e1000e_commit_phy(struct e1000_hw *hw);
+
+extern bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw);
@@ -2726,8 +2687,10 @@
+}
+
+#endif /* _E1000_H_ */
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/es2lan.c 2007-08-27 14:01:22.000000000 -0400
+Index: linux-2.6.23/drivers/net/e1000e/es2lan.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/es2lan.c
@@ -0,0 +1,1232 @@
+/*******************************************************************************
+
@@ -3961,9 +3924,11 @@
+ .nvm_ops = &es2_nvm_ops,
+};
+
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/ethtool.c 2007-08-27 14:01:22.000000000 -0400
-@@ -0,0 +1,1774 @@
+Index: linux-2.6.23/drivers/net/e1000e/ethtool.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/ethtool.c
+@@ -0,0 +1,1791 @@
+/*******************************************************************************
+
+ Intel PRO/1000 Linux driver
@@ -4076,6 +4041,7 @@
+{
+ struct e1000_adapter *adapter = netdev_priv(netdev);
+ struct e1000_hw *hw = &adapter->hw;
++ u32 status;
+
+ if (hw->media_type == e1000_media_type_copper) {
+
@@ -4113,16 +4079,16 @@
+ ecmd->transceiver = XCVR_EXTERNAL;
+ }
+
-+ if (er32(STATUS) & E1000_STATUS_LU) {
-+
-+ adapter->hw.mac.ops.get_link_up_info(hw, &adapter->link_speed,
-+ &adapter->link_duplex);
-+ ecmd->speed = adapter->link_speed;
-+
-+ /* unfortunately FULL_DUPLEX != DUPLEX_FULL
-+ * and HALF_DUPLEX != DUPLEX_HALF */
++ status = er32(STATUS);
++ if (status & E1000_STATUS_LU) {
++ if (status & E1000_STATUS_SPEED_1000)
++ ecmd->speed = 1000;
++ else if (status & E1000_STATUS_SPEED_100)
++ ecmd->speed = 100;
++ else
++ ecmd->speed = 10;
+
-+ if (adapter->link_duplex == FULL_DUPLEX)
++ if (status & E1000_STATUS_FD)
+ ecmd->duplex = DUPLEX_FULL;
+ else
+ ecmd->duplex = DUPLEX_HALF;
@@ -4136,6 +4102,16 @@
+ return 0;
+}
+
++static u32 e1000_get_link(struct net_device *netdev)
++{
++ struct e1000_adapter *adapter = netdev_priv(netdev);
++ struct e1000_hw *hw = &adapter->hw;
++ u32 status;
++
++ status = er32(STATUS);
++ return (status & E1000_STATUS_LU);
++}
++
+static int e1000_set_spd_dplx(struct e1000_adapter *adapter, u16 spddplx)
+{
+ struct e1000_mac_info *mac = &adapter->hw.mac;
@@ -4267,6 +4243,7 @@
+ hw->mac.original_fc = hw->mac.fc;
+
+ if (adapter->fc_autoneg == AUTONEG_ENABLE) {
++ hw->mac.fc = e1000_fc_default;
+ if (netif_running(adapter->netdev)) {
+ e1000e_down(adapter);
+ e1000e_up(adapter);
@@ -4543,8 +4520,6 @@
+
+ strncpy(drvinfo->fw_version, firmware_version, 32);
+ strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-+ drvinfo->n_stats = E1000_STATS_LEN;
-+ drvinfo->testinfo_len = E1000_TEST_LEN;
+ drvinfo->regdump_len = e1000_get_regs_len(netdev);
+ drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
+}
@@ -4752,10 +4727,16 @@
+ REG_SET_AND_CHECK(E1000_RCTL, before, 0x003FFFFB);
+ REG_SET_AND_CHECK(E1000_TCTL, 0xFFFFFFFF, 0x00000000);
+
-+ REG_SET_AND_CHECK(E1000_RCTL, 0xFFFFFFFF, 0x01FFFFFF);
-+ REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFF000, 0xFFFFFFFF);
-+ REG_PATTERN_TEST(E1000_TXCW, 0x0000FFFF, 0x0000FFFF);
-+ REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFF000, 0xFFFFFFFF);
++ REG_SET_AND_CHECK(E1000_RCTL, before, 0xFFFFFFFF);
++ REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
++ if ((mac->type != e1000_ich8lan) &&
++ (mac->type != e1000_ich9lan))
++ REG_PATTERN_TEST(E1000_TXCW, 0xC000FFFF, 0x0000FFFF);
++ REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
++ REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
++ for (i = 0; i < mac->rar_entry_count; i++)
++ REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
++ 0x8003FFFF, 0xFFFFFFFF);
+
+ for (i = 0; i < mac->mta_reg_count; i++)
+ REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);
@@ -5412,11 +5393,11 @@
+ }
+
+ *data = e1000_setup_desc_rings(adapter);
-+ if (data)
++ if (*data)
+ goto out;
+
+ *data = e1000_setup_loopback_test(adapter);
-+ if (data)
++ if (*data)
+ goto err_loopback;
+
+ *data = e1000_run_loopback_test(adapter);
@@ -5459,9 +5440,16 @@
+ return *data;
+}
+
-+static int e1000_diag_test_count(struct net_device *netdev)
++static int e1000e_get_sset_count(struct net_device *netdev, int sset)
+{
-+ return E1000_TEST_LEN;
++ switch (sset) {
++ case ETH_SS_TEST:
++ return E1000_TEST_LEN;
++ case ETH_SS_STATS:
++ return E1000_STATS_LEN;
++ default:
++ return -EOPNOTSUPP;
++ }
+}
+
+static void e1000_diag_test(struct net_device *netdev,
@@ -5658,11 +5646,6 @@
+ return 0;
+}
+
-+static int e1000_get_stats_count(struct net_device *netdev)
-+{
-+ return E1000_STATS_LEN;
-+}
-+
+static void e1000_get_ethtool_stats(struct net_device *netdev,
+ struct ethtool_stats *stats,
+ u64 *data)
@@ -5710,7 +5693,7 @@
+ .get_msglevel = e1000_get_msglevel,
+ .set_msglevel = e1000_set_msglevel,
+ .nway_reset = e1000_nway_reset,
-+ .get_link = ethtool_op_get_link,
++ .get_link = e1000_get_link,
+ .get_eeprom_len = e1000_get_eeprom_len,
+ .get_eeprom = e1000_get_eeprom,
+ .set_eeprom = e1000_set_eeprom,
@@ -5726,20 +5709,21 @@
+ .set_sg = ethtool_op_set_sg,
+ .get_tso = ethtool_op_get_tso,
+ .set_tso = e1000_set_tso,
-+ .self_test_count = e1000_diag_test_count,
+ .self_test = e1000_diag_test,
+ .get_strings = e1000_get_strings,
+ .phys_id = e1000_phys_id,
-+ .get_stats_count = e1000_get_stats_count,
+ .get_ethtool_stats = e1000_get_ethtool_stats,
++ .get_sset_count = e1000e_get_sset_count,
+};
+
+void e1000e_set_ethtool_ops(struct net_device *netdev)
+{
+ SET_ETHTOOL_OPS(netdev, &e1000_ethtool_ops);
+}
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/hw.h 2007-08-27 14:01:22.000000000 -0400
+Index: linux-2.6.23/drivers/net/e1000e/hw.h
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/hw.h
@@ -0,0 +1,864 @@
+/*******************************************************************************
+
@@ -6595,7 +6579,7 @@
+
+#ifdef DEBUG
+#define hw_dbg(hw, format, arg...) \
-+ printk(KERN_DEBUG, "%s: " format, e1000_get_hw_dev_name(hw), ##arg);
++ printk(KERN_DEBUG "%s: " format, e1000e_get_hw_dev_name(hw), ##arg)
+#else
+static inline int __attribute__ ((format (printf, 2, 3)))
+hw_dbg(struct e1000_hw *hw, const char *format, ...)
@@ -6605,8 +6589,10 @@
+#endif
+
+#endif
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/ich8lan.c 2007-08-27 14:01:22.000000000 -0400
+Index: linux-2.6.23/drivers/net/e1000e/ich8lan.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/ich8lan.c
@@ -0,0 +1,2225 @@
+/*******************************************************************************
+
@@ -8833,9 +8819,11 @@
+ .nvm_ops = &ich8_nvm_ops,
+};
+
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/lib.c 2007-08-27 14:01:22.000000000 -0400
-@@ -0,0 +1,2466 @@
+Index: linux-2.6.23/drivers/net/e1000e/lib.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/lib.c
+@@ -0,0 +1,2493 @@
+/*******************************************************************************
+
+ Intel PRO/1000 Linux driver
@@ -9477,9 +9465,15 @@
+ if (e1000_check_reset_block(hw))
+ return 0;
+
-+ ret_val = e1000_set_default_fc_generic(hw);
-+ if (ret_val)
-+ return ret_val;
++ /*
++ * If flow control is set to default, set flow control based on
++ * the EEPROM flow control settings.
++ */
++ if (mac->fc == e1000_fc_default) {
++ ret_val = e1000_set_default_fc_generic(hw);
++ if (ret_val)
++ return ret_val;
++ }
+
+ /* We want to save off the original Flow Control configuration just
+ * in case we get disconnected and then reconnected into a different
@@ -11302,9 +11296,32 @@
+ return ret_val;
+}
+
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/netdev.c 2007-08-27 14:01:22.000000000 -0400
-@@ -0,0 +1,4460 @@
++s32 e1000e_read_part_num(struct e1000_hw *hw, u32 *part_num)
++{
++ s32 ret_val;
++ u16 nvm_data;
++
++ ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data);
++ if (ret_val) {
++ hw_dbg(hw, "NVM Read Error\n");
++ return ret_val;
++ }
++ *part_num = (u32)(nvm_data << 16);
++
++ ret_val = e1000_read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data);
++ if (ret_val) {
++ hw_dbg(hw, "NVM Read Error\n");
++ return ret_val;
++ }
++ *part_num |= nvm_data;
++
++ return 0;
++}
+Index: linux-2.6.23/drivers/net/e1000e/netdev.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/netdev.c
+@@ -0,0 +1,4438 @@
+/*******************************************************************************
+
+ Intel PRO/1000 Linux driver
@@ -11373,9 +11390,7 @@
+ **/
+char *e1000e_get_hw_dev_name(struct e1000_hw *hw)
+{
-+ struct e1000_adapter *adapter = hw->back;
-+ struct net_device *netdev = adapter->netdev;
-+ return netdev->name;
++ return hw->adapter->netdev->name;
+}
+#endif
+
@@ -12456,12 +12471,12 @@
+ mod_timer(&adapter->watchdog_timer, jiffies + 1);
+ }
+
-+ if (netif_rx_schedule_prep(netdev)) {
++ if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
+ adapter->total_tx_bytes = 0;
+ adapter->total_tx_packets = 0;
+ adapter->total_rx_bytes = 0;
+ adapter->total_rx_packets = 0;
-+ __netif_rx_schedule(netdev);
++ __netif_rx_schedule(netdev, &adapter->napi);
+ } else {
+ atomic_dec(&adapter->irq_sem);
+ }
@@ -12519,12 +12534,12 @@
+ mod_timer(&adapter->watchdog_timer, jiffies + 1);
+ }
+
-+ if (netif_rx_schedule_prep(netdev)) {
++ if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
+ adapter->total_tx_bytes = 0;
+ adapter->total_tx_packets = 0;
+ adapter->total_rx_bytes = 0;
+ adapter->total_rx_packets = 0;
-+ __netif_rx_schedule(netdev);
++ __netif_rx_schedule(netdev, &adapter->napi);
+ } else {
+ atomic_dec(&adapter->irq_sem);
+ }
@@ -12790,7 +12805,6 @@
+
+ tx_ring->next_to_use = 0;
+ tx_ring->next_to_clean = 0;
-+ tx_ring->last_tx_tso = 0;
+
+ writel(0, adapter->hw.hw_addr + tx_ring->head);
+ writel(0, adapter->hw.hw_addr + tx_ring->tail);
@@ -12970,10 +12984,10 @@
+ * e1000_clean - NAPI Rx polling callback
+ * @adapter: board private structure
+ **/
-+static int e1000_clean(struct net_device *poll_dev, int *budget)
++static int e1000_clean(struct napi_struct *napi, int budget)
+{
-+ struct e1000_adapter *adapter;
-+ int work_to_do = min(*budget, poll_dev->quota);
++ struct e1000_adapter *adapter = container_of(napi, struct e1000_adapter, napi);
++ struct net_device *poll_dev = adapter->netdev;
+ int tx_cleaned = 0, work_done = 0;
+
+ /* Must NOT use netdev_priv macro here. */
@@ -12992,25 +13006,19 @@
+ spin_unlock(&adapter->tx_queue_lock);
+ }
+
-+ adapter->clean_rx(adapter, &work_done, work_to_do);
-+ *budget -= work_done;
-+ poll_dev->quota -= work_done;
++ adapter->clean_rx(adapter, &work_done, budget);
+
+ /* If no Tx and not enough Rx work done, exit the polling mode */
-+ if ((!tx_cleaned && (work_done == 0)) ||
++ if ((!tx_cleaned && (work_done < budget)) ||
+ !netif_running(poll_dev)) {
+quit_polling:
+ if (adapter->itr_setting & 3)
+ e1000_set_itr(adapter);
-+ netif_rx_complete(poll_dev);
-+ if (test_bit(__E1000_DOWN, &adapter->state))
-+ atomic_dec(&adapter->irq_sem);
-+ else
-+ e1000_irq_enable(adapter);
-+ return 0;
++ netif_rx_complete(poll_dev, napi);
++ e1000_irq_enable(adapter);
+ }
+
-+ return 1;
++ return work_done;
+}
+
+static void e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid)
@@ -13317,7 +13325,6 @@
+ break;
+ }
+
-+#ifndef CONFIG_E1000_DISABLE_PACKET_SPLIT
+ /*
+ * 82571 and greater support packet-split where the protocol
+ * header is placed in skb->data and the packet data is
@@ -13337,7 +13344,7 @@
+ pages = PAGE_USE_COUNT(adapter->netdev->mtu);
+ if ((pages <= 3) && (PAGE_SIZE <= 16384) && (rctl & E1000_RCTL_LPE))
+ adapter->rx_ps_pages = pages;
-+#endif
++
+ if (adapter->rx_ps_pages) {
+ /* Configure extra packet-split registers */
+ rfctl = er32(RFCTL);
@@ -13748,7 +13755,7 @@
+
+ clear_bit(__E1000_DOWN, &adapter->state);
+
-+ netif_poll_enable(adapter->netdev);
++ napi_enable(&adapter->napi);
+ e1000_irq_enable(adapter);
+
+ /* fire a link change interrupt to start the watchdog */
@@ -13781,7 +13788,7 @@
+ e1e_flush();
+ msleep(10);
+
-+ netif_poll_disable(netdev);
++ napi_disable(&adapter->napi);
+ e1000_irq_disable(adapter);
+
+ del_timer_sync(&adapter->watchdog_timer);
@@ -13914,7 +13921,7 @@
+ /* From here on the code is the same as e1000e_up() */
+ clear_bit(__E1000_DOWN, &adapter->state);
+
-+ netif_poll_enable(netdev);
++ napi_enable(&adapter->napi);
+
+ e1000_irq_enable(adapter);
+
@@ -14523,15 +14530,6 @@
+ while (len) {
+ buffer_info = &tx_ring->buffer_info[i];
+ size = min(len, max_per_txd);
-+ /* Workaround for Controller erratum --
-+ * descriptor for non-tso packet in a linear SKB that follows a
-+ * tso gets written back prematurely before the data is fully
-+ * DMA'd to the controller */
-+ if (tx_ring->last_tx_tso && !skb_is_gso(skb)) {
-+ tx_ring->last_tx_tso = 0;
-+ if (!skb->data_len)
-+ size -= 4;
-+ }
+
+ /* Workaround for premature desc write-backs
+ * in TSO mode. Append 4-byte sentinel desc */
@@ -14750,14 +14748,13 @@
+ unsigned int max_per_txd = E1000_MAX_PER_TXD;
+ unsigned int max_txd_pwr = E1000_MAX_TXD_PWR;
+ unsigned int tx_flags = 0;
-+ unsigned int len = skb->len;
++ unsigned int len = skb->len - skb->data_len;
+ unsigned long irq_flags;
-+ unsigned int nr_frags = 0;
-+ unsigned int mss = 0;
++ unsigned int nr_frags;
++ unsigned int mss;
+ int count = 0;
+ int tso;
+ unsigned int f;
-+ len -= skb->data_len;
+
+ if (test_bit(__E1000_DOWN, &adapter->state)) {
+ dev_kfree_skb_any(skb);
@@ -14785,7 +14782,7 @@
+ * points to just header, pull a few bytes of payload from
+ * frags into skb->data */
+ hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
-+ if (skb->data_len && (hdr_len == (skb->len - skb->data_len))) {
++ if (skb->data_len && (hdr_len == len)) {
+ unsigned int pull_size;
+
+ pull_size = min((unsigned int)4, skb->data_len);
@@ -14804,10 +14801,6 @@
+ count++;
+ count++;
+
-+ /* Controller Erratum workaround */
-+ if (!skb->data_len && tx_ring->last_tx_tso && !skb_is_gso(skb))
-+ count++;
-+
+ count += TXD_USE_COUNT(len, max_txd_pwr);
+
+ nr_frags = skb_shinfo(skb)->nr_frags;
@@ -14843,12 +14836,10 @@
+ return NETDEV_TX_OK;
+ }
+
-+ if (tso) {
-+ tx_ring->last_tx_tso = 1;
++ if (tso)
+ tx_flags |= E1000_TX_FLAGS_TSO;
-+ } else if (e1000_tx_csum(adapter, skb)) {
++ else if (e1000_tx_csum(adapter, skb))
+ tx_flags |= E1000_TX_FLAGS_CSUM;
-+ }
+
+ /* Old method was to assume IPv4 packet by default if TSO was enabled.
+ * 82571 hardware supports TSO capabilities for IPv6 as well...
@@ -14861,7 +14852,7 @@
+ /* handle pci_map_single() error in e1000_tx_map */
+ dev_kfree_skb_any(skb);
+ spin_unlock_irqrestore(&adapter->tx_queue_lock, irq_flags);
-+ return NETDEV_TX_BUSY;
++ return NETDEV_TX_OK;
+ }
+
+ e1000_tx_queue(adapter, tx_flags, count);
@@ -15289,6 +15280,7 @@
+{
+ struct e1000_hw *hw = &adapter->hw;
+ struct net_device *netdev = adapter->netdev;
++ u32 part_num;
+
+ /* print bus type/speed/width info */
+ ndev_info(netdev, "(PCI Express:2.5GB/s:%s) "
@@ -15303,6 +15295,10 @@
+ ndev_info(netdev, "Intel(R) PRO/%s Network Connection\n",
+ (hw->phy.type == e1000_phy_ife)
+ ? "10/100" : "1000");
++ e1000e_read_part_num(hw, &part_num);
++ ndev_info(netdev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
++ hw->mac.type, hw->phy.type,
++ (part_num >> 8), (part_num & 0xff));
+}
+
+/**
@@ -15365,7 +15361,6 @@
+ if (!netdev)
+ goto err_alloc_etherdev;
+
-+ SET_MODULE_OWNER(netdev);
+ SET_NETDEV_DEV(netdev, &pdev->dev);
+
+ pci_set_drvdata(pdev, netdev);
@@ -15409,8 +15404,7 @@
+ e1000e_set_ethtool_ops(netdev);
+ netdev->tx_timeout = &e1000_tx_timeout;
+ netdev->watchdog_timeo = 5 * HZ;
-+ netdev->poll = &e1000_clean;
-+ netdev->weight = 64;
++ netif_napi_add(netdev, &adapter->napi, e1000_clean, 64);
+ netdev->vlan_rx_register = e1000_vlan_rx_register;
+ netdev->vlan_rx_add_vid = e1000_vlan_rx_add_vid;
+ netdev->vlan_rx_kill_vid = e1000_vlan_rx_kill_vid;
@@ -15525,6 +15519,7 @@
+
+ /* Initialize link parameters. User can change them with ethtool */
+ adapter->hw.mac.autoneg = 1;
++ adapter->fc_autoneg = 1;
+ adapter->hw.mac.original_fc = e1000_fc_default;
+ adapter->hw.mac.fc = e1000_fc_default;
+ adapter->hw.phy.autoneg_advertised = 0x2f;
@@ -15579,7 +15574,6 @@
+ /* tell the stack to leave us alone until e1000_open() is called */
+ netif_carrier_off(netdev);
+ netif_stop_queue(netdev);
-+ netif_poll_disable(netdev);
+
+ strcpy(netdev->name, "eth%d");
+ err = register_netdev(netdev);
@@ -15737,9 +15731,10 @@
+static int __init e1000_init_module(void)
+{
+ int ret;
-+ printk(KERN_INFO "Intel(R) PRO/1000 Network Driver - %s\n",
-+ e1000e_driver_version);
-+ printk(KERN_INFO "Copyright (c) 1999-2007 Intel Corporation.\n");
++ printk(KERN_INFO "%s: Intel(R) PRO/1000 Network Driver - %s\n",
++ e1000e_driver_name, e1000e_driver_version);
++ printk(KERN_INFO "%s: Copyright (c) 1999-2007 Intel Corporation.\n",
++ e1000e_driver_name);
+ ret = pci_register_driver(&e1000_driver);
+
+ return ret;
@@ -15765,8 +15760,10 @@
+MODULE_VERSION(DRV_VERSION);
+
+/* e1000_main.c */
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/param.c 2007-08-27 14:01:22.000000000 -0400
+Index: linux-2.6.23/drivers/net/e1000e/param.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/param.c
@@ -0,0 +1,382 @@
+/*******************************************************************************
+
@@ -16150,8 +16147,10 @@
+ }
+ }
+}
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/net/e1000e/phy.c 2007-08-27 14:01:22.000000000 -0400
+Index: linux-2.6.23/drivers/net/e1000e/phy.c
+===================================================================
+--- /dev/null
++++ linux-2.6.23/drivers/net/e1000e/phy.c
@@ -0,0 +1,1773 @@
+/*******************************************************************************
+
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/proc-scsi-scsi-fix.diff new/patches.fixes/proc-scsi-scsi-fix.diff
--- old/patches.fixes/proc-scsi-scsi-fix.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/proc-scsi-scsi-fix.diff 2007-10-29 22:56:32.000000000 +0100
@@ -0,0 +1,108 @@
+From: Jeff Mahoney
+Subject: [PATCH] scsi: iterate over devices individually for /proc/scsi/scsi
+References: 263731
+
+ On systems with very large numbers (> 1600 or so) of SCSI devices,
+ cat /proc/scsi/scsi ends up failing with -ENOMEM. This is due to
+ the show routine simply iterating over all of the devices with
+ bus_for_each_dev(), and trying to dump all of them into the buffer
+ at the same time. On my test system (using scsi_debug with 4064 devices),
+ the output ends up being ~ 632k, far more than kmalloc will typically allow.
+
+ This patch defines its own seq_file opreations to iterate over the scsi
+ devices.The result is that each show() operation only dumps ~ 180 bytes
+ into the buffer at a time so we don't run out of memory.
+
+ If the "Attached devices" header isn't required, we can dump the
+ sfile->private bit completely.
+
+Signed-off-by: Jeff Mahoney
+
+---
+
+ drivers/scsi/scsi_proc.c | 58 ++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 52 insertions(+), 6 deletions(-)
+
+--- a/drivers/scsi/scsi_proc.c 2007-10-29 13:56:28.000000000 -0400
++++ b/drivers/scsi/scsi_proc.c 2007-10-29 15:50:57.000000000 -0400
+@@ -294,20 +294,66 @@ static ssize_t proc_scsi_write(struct fi
+ return err;
+ }
+
+-static int proc_scsi_show(struct seq_file *s, void *p)
++static int always_match(struct device *dev, void *data)
+ {
+- seq_printf(s, "Attached devices:\n");
+- bus_for_each_dev(&scsi_bus_type, NULL, s, proc_print_scsidevice);
+- return 0;
++ return 1;
++}
++
++static inline struct device *next_scsi_device(struct device *start)
++{
++ struct device *next = bus_find_device(&scsi_bus_type, start, NULL,
++ always_match);
++ put_device(start);
++ return next;
++}
++
++static void *scsi_seq_start(struct seq_file *sfile, loff_t *pos)
++{
++ struct device *dev = NULL;
++ loff_t n = *pos;
++
++ while ((dev = next_scsi_device(dev))) {
++ if (!n--)
++ break;
++ sfile->private++;
++ }
++ return dev;
++}
++
++static void *scsi_seq_next(struct seq_file *sfile, void *v, loff_t *pos)
++{
++ (*pos)++;
++ sfile->private++;
++ return next_scsi_device(v);
++}
++
++static void scsi_seq_stop(struct seq_file *sfile, void *v)
++{
++ put_device(v);
++}
++
++static int scsi_seq_show(struct seq_file *sfile, void *dev)
++{
++ if (!sfile->private)
++ seq_puts(sfile, "Attached devices:\n");
++
++ return proc_print_scsidevice(dev, sfile);
+ }
+
++static struct seq_operations scsi_seq_ops = {
++ .start = scsi_seq_start,
++ .next = scsi_seq_next,
++ .stop = scsi_seq_stop,
++ .show = scsi_seq_show
++};
++
+ static int proc_scsi_open(struct inode *inode, struct file *file)
+ {
+ /*
+ * We don't really needs this for the write case but it doesn't
+ * harm either.
+ */
+- return single_open(file, proc_scsi_show, NULL);
++ return seq_open(file, &scsi_seq_ops);
+ }
+
+ static struct file_operations proc_scsi_operations = {
+@@ -315,7 +361,7 @@ static struct file_operations proc_scsi_
+ .read = seq_read,
+ .write = proc_scsi_write,
+ .llseek = seq_lseek,
+- .release = single_release,
++ .release = seq_release,
+ };
+
+ int __init scsi_init_procfs(void)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/remove-transparent-bridge-sizing new/patches.fixes/remove-transparent-bridge-sizing
--- old/patches.fixes/remove-transparent-bridge-sizing 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.fixes/remove-transparent-bridge-sizing 2007-10-26 13:43:32.000000000 +0200
@@ -0,0 +1,38 @@
+From: Gary Hade
+Date: Wed Oct 3 15:55:51 2007 -0700
+Subject: PCI: remove transparent bridge sizing
+References: 331027
+
+Remove transparent bridge sizing.
+
+Due to code in pci_read_bridge_bases() [drivers/pci/probe.c] the child
+bus of a transparent bridge already has access to the parent bus
+resources so transparent bridge sizing appears unnecessary. The bridge
+sizing includes alignment and granularity adjustments that can cause
+significantly more memory to be reserved from the parant bus than
+required by devices on the child bus and allotted by _CRS.
+
+
+Signed-off-by: Gary Hade
+Signed-off-by: Greg Kroah-Hartman
+commit 8fa5913d54f3b1e09948e6a0db34da887e05ff1f
+
+---
+ drivers/pci/setup-bus.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/pci/setup-bus.c
++++ b/drivers/pci/setup-bus.c
+@@ -472,7 +472,12 @@ void pci_bus_size_bridges(struct pci_bus
+ break;
+
+ case PCI_CLASS_BRIDGE_PCI:
++ /* don't size subtractive decoding (transparent)
++ * PCI-to-PCI bridges */
++ if (bus->self->transparent)
++ break;
+ pci_bridge_check_ranges(bus);
++ /* fall through */
+ default:
+ pbus_size_io(bus);
+ /* If the bridge supports prefetchable range, size it
++++++ series.conf ++++++
--- kernel-source/series.conf 2007-10-25 12:17:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2007-10-31 08:02:57.000000000 +0100
@@ -423,6 +423,8 @@
# Remaining SCSI patches (garloff)
patches.suse/scsi-error-test-unit-ready-timeout
+ patches.fixes/proc-scsi-scsi-fix.diff
+
########################################################
# Network
########################################################
@@ -446,6 +448,7 @@
########################################################
# PCI and PCI hotplug
########################################################
+ patches.fixes/remove-transparent-bridge-sizing
########################################################
# sysfs / driver core
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org