commit bef9c558841604116704e10b3d9ff3dbf4939423 tree f5c58b6b0cfd2a92fb3b1d1f4cbfdfb3df6f45d6 parent 3db602bdcd52d8b7523cfb4fb705cea84dbe1617 parent 4b463f785837f73bdd88ae3821bb7b69599010c9 author Linus Torvalds Wed, 25 May 2005 18:01:26 -0700 committer Linus Torvalds Wed, 25 May 2005 18:01:26 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 commit 3db602bdcd52d8b7523cfb4fb705cea84dbe1617 tree dd4ed5173fdfe330961131b72448243eda8ac803 parent d20c507f28dbee33086e8212b98f9ddc5372cd81 parent 4c3a53d4108367f639e5e0fe9366dfd7679c5514 author Linus Torvalds Wed, 25 May 2005 17:56:57 -0700 committer Linus Torvalds Wed, 25 May 2005 17:56:57 -0700 Merge of 'new-ids' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 4c3a53d4108367f639e5e0fe9366dfd7679c5514 tree 0dcafa1f300870aecff4ac45bda16879aa89e61d parent 525a099771d348a25d12ef9c47aa8680c7317e35 author Francisco Javier Wed, 25 May 2005 19:29:37 -0400 committer Jeff Garzik Wed, 25 May 2005 19:29:37 -0400 [PATCH] sata_promise: add PCI ID for FastTrak TX2200 2-ports commit 525a099771d348a25d12ef9c47aa8680c7317e35 tree 86fe91606c8994f6358c8afeb1c3b9f0f4784bd7 parent 2a24ab628aa7b190be32f63dfb6d96f3fb61580a author NAKAMURA Kenta Wed, 25 May 2005 19:28:38 -0400 committer Jeff Garzik Wed, 25 May 2005 19:28:38 -0400 [PATCH] sata_sil: new ID 1002:437A for ATI IXP400 commit d20c507f28dbee33086e8212b98f9ddc5372cd81 tree 30b3bda5e47d088b46ab8eab4d69d059a71197e1 parent a8bacec09352b86bd389cc93a20008577fa14764 author Colin Leroy Wed, 25 May 2005 12:31:35 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:29 -0700 [PATCH] therm_adt746x: show correct sensor locations This patch shows the correct locations of the heat sensors present in iBook and PowerBooks G4, instead of displaying them as being on CPU and GPU (which is not always the case). Signed-off-by: Colin Leroy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8bacec09352b86bd389cc93a20008577fa14764 tree 608170ccc532ea2b96f1a5f073ae154cb8ce80fc parent 3bf4fb820d7382318d178bd765c20028415466ab author Colin Leroy Wed, 25 May 2005 12:31:34 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:29 -0700 [PATCH] Make sure therm_adt746x only handles known hardware This patch limits therm_adt746x to currently existing fan controllers in Apple laptops. It may avoid problems with future hardware. Signed-off-by: Colin Leroy Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4f50f003dc568f6fc3904d451c562007bd09640 tree 6af02e623ba96d367c1c3948b9bb85bc793cc47f parent 4f60fdf613536402e3313c5019b3ae6060b2ae4a author Roland Dreier Wed, 25 May 2005 12:31:29 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:28 -0700 [PATCH] IB: allow NULL sa_query callbacks Check if a client passes a NULL callback into an SA query, and if so, never call back. This fixes an oops if someone unloads ib_ipoib and ib_sa in rapid succession. ib_ipoib does an MCMember delete with a NULL callback and 0 timeout on unload, which is usually fine since the delete completes successfully. However, if ib_sa is unloaded immediately afterwards, the delete will be canceled and ib_sa will try to call the (now already unloaded) ib_ipoib module back with the cancel completion, which triggers the oops. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 561e148ea972a6e8d2c8f7aecc658b3a64f7a6de tree 39feb619de4a5e6b6a3695082e44398c6140699f parent e4f50f003dc568f6fc3904d451c562007bd09640 author Roland Dreier Wed, 25 May 2005 12:31:30 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:28 -0700 [PATCH] IB: fix potential ib_umad leak Free all unclaimed MAD receive buffers when userspace closes our file so we don't leak memory. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f60fdf613536402e3313c5019b3ae6060b2ae4a tree 85205ce2d6c7b0d846fddc93527b4d55820ffe3b parent dca79a046b93a81496bb30ca01177fb17f37ab72 author Alexander Nyberg Wed, 25 May 2005 12:31:28 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:28 -0700 [PATCH] x86_64: CONFIG_BUG=n fixes Fixes some !CONFIG_BUG warnings: include/asm/mmu_context.h: I funktion `switch_mm': include/asm/mmu_context.h:57: varning: implicit declaration of function `out_of_line_bug' Signed-off-by: Alexander Nyberg Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bf4fb820d7382318d178bd765c20028415466ab tree 1a0cbad2e1d661baa60162d3246e5b6c44b476d0 parent 561e148ea972a6e8d2c8f7aecc658b3a64f7a6de author Roland Dreier Wed, 25 May 2005 12:31:31 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:28 -0700 [PATCH] IB: fix endianness of path record MTU field Make MTU field in SA PathRecord and MCMemberRecord a u8 rather than an enum to avoid complications with endianness. Signed-off-by: Roland Dreier Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dca79a046b93a81496bb30ca01177fb17f37ab72 tree ed5435413221f7a7b7e28edb49a4b47a9ac94594 parent 5daf05fbf73fc199e7a93a818e504856d07c5586 author Neil Horman Wed, 25 May 2005 12:31:27 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:27 -0700 [PATCH] ipmi build fix It looks like the recent IPMI patches had some -mm-onlyisms. Signed-off-by: Neil Horman Cc: Corey Minyard Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5daf05fbf73fc199e7a93a818e504856d07c5586 tree 8e4eeb3012164f9aea42b7880460299bf7a09880 parent 1b981021e88c8c28dc6a22cb1a327d8dc9296473 author Gerd Knorr Wed, 25 May 2005 12:31:26 -0700 committer Linus Torvalds Wed, 25 May 2005 15:31:27 -0700 [PATCH] v4l: bttv i2c oops fix Don't try to access the i2c bus if the register wasn't successful. Signed-off-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b463f785837f73bdd88ae3821bb7b69599010c9 tree 80dc0a7e3e33596ff3ece410d9ff9e6b63e45b87 parent 6df16d0c35b9c0d3627f30c106e6142d3d12662b parent 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 author David S. Miller Wed, 25 May 2005 14:58:04 -0700 committer David S. Miller Wed, 25 May 2005 14:58:04 -0700 Merge of /home/davem/src/GIT/linux-2.6/.git/ commit 1b981021e88c8c28dc6a22cb1a327d8dc9296473 tree 5eeefa658d7f9c13cd352994805ac3ead628b7e9 parent 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 parent f6f3a488e56783836a0b6ca9188719a1229f505c author Linus Torvalds Wed, 25 May 2005 14:01:50 -0700 committer Linus Torvalds Wed, 25 May 2005 14:01:50 -0700 Merge of 'for-linus' branch from rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit f6f3a488e56783836a0b6ca9188719a1229f505c tree 7fe7a590feb16b650ecdb6359eee695123217051 parent a58eae6480f354595c3954534e1ab591dc3ef1bf parent dfa1b73ffb414b64dc0452260132a090eb25bf52 author Wed, 25 May 2005 13:57:36 -0400 committer Jeff Garzik Wed, 25 May 2005 13:57:36 -0400 Automatic merge of /spare/repo/netdev-2.6 branch amd8111 commit a58eae6480f354595c3954534e1ab591dc3ef1bf tree d73d9905ccb224c09c41a2ebebf08b29fa90eb7a parent 09e62666d8a6312426f96bf483cdb003bde556fe parent 1bcd315362e215a72b56d1330bbf32f1c74eefb5 author Wed, 25 May 2005 13:57:25 -0400 committer Jeff Garzik Wed, 25 May 2005 13:57:25 -0400 Automatic merge of /spare/repo/netdev-2.6 branch pcnet32 commit 09e62666d8a6312426f96bf483cdb003bde556fe tree 1ecb7fd093169fb77d7cd5925bc214fd6c6d82e4 parent 34812c9e188b47b1d6c9fff8ba530e6f2365ebc4 parent ac79c82e793bc2440c4765e5eb1b834d2c18edf2 author Wed, 25 May 2005 13:57:15 -0400 committer Jeff Garzik Wed, 25 May 2005 13:57:15 -0400 Automatic merge of /spare/repo/netdev-2.6 branch ixgb commit 34812c9e188b47b1d6c9fff8ba530e6f2365ebc4 tree 63e968991d043a30b80f7e3f99a3f6445455a704 parent d6d78f63cea62851806bf6ac40c6f53349de442b parent 2648345fcbadfae8e7113112ff9402e465a184dc author Wed, 25 May 2005 13:57:03 -0400 committer Jeff Garzik Wed, 25 May 2005 13:57:03 -0400 Automatic merge of /spare/repo/netdev-2.6 branch e1000 commit d6d78f63cea62851806bf6ac40c6f53349de442b tree b9bebd1bf342ae93f1d909641725e3d084ed61a9 parent a83d5cf7a1d1dd22f3a8162b728a7e895192dda8 parent 042e2fb70006f135469d546726451b7d14768980 author Wed, 25 May 2005 13:56:55 -0400 committer Jeff Garzik Wed, 25 May 2005 13:56:55 -0400 Automatic merge of /spare/repo/netdev-2.6 branch e100 commit a83d5cf7a1d1dd22f3a8162b728a7e895192dda8 tree 6c6081aa8d8c8679e0a446234dceb0852ca34ca0 parent 2a24ab628aa7b190be32f63dfb6d96f3fb61580a parent 9092f46b5aed4515d9a427d5dab3be1584851f07 author Wed, 25 May 2005 13:56:22 -0400 committer Jeff Garzik Wed, 25 May 2005 13:56:22 -0400 Merge of /spare/repo/netdev-2.6 branch misc-fixes commit 384f1fcd2db8bc5a15f20f10793d8e1c82acd6c5 tree 146040edb5fb3b7ce29ba468f6392b7eadf28fdc parent 0e15850200437c60b969025500e466383ec51ed8 author Jens Axboe Wed, 25 May 2005 17:00:15 +0200 committer Linus Torvalds Wed, 25 May 2005 10:17:08 -0700 [PATCH] relax ide-cd dma restrictions This has been sitting for a while, and is causing lots of grief for people burning CDs. It relaxes the dma restriction for ide-cd, requiring only the length to be 32-byte aligned, address should be fine at normal double word alignment. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit d0e8e29100c9866878d43bbb40ca17e8fe429851 tree 079da8af2553ae3dd3556e82a5f8d2362b0ea755 parent 8f80e5c911465743ccd3a328f992c7d8aaebf1e8 author Stephen Rothwell Wed, 25 May 2005 16:29:26 +1000 committer Linus Torvalds Wed, 25 May 2005 10:13:43 -0700 [PATCH] ppc64 iSeries: fix boot time setting For quite a while, there has existed a hypervisor bug on legacy iSeries which means that we do not get the boot time set in the kernel. This patch works around that bug. This was most noticable when the root partition needed to be checked at every boot as the kernel thought it was some time in 1905 until user mode reset the time correctly. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 0e15850200437c60b969025500e466383ec51ed8 tree 1acb5a22199c8eab0a04d3162a51abf2c046b70c parent d0e8e29100c9866878d43bbb40ca17e8fe429851 author David Woodhouse Wed, 25 May 2005 09:49:13 +0100 committer Linus Torvalds Wed, 25 May 2005 10:13:43 -0700 [PATCH] Speedtouch resync after lost signal. There's a bigger Speedtouch update coming your way after 2.6.12 but in the meantime, let's at least make it automatically resync if the DSL signal is lost. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit 8f80e5c911465743ccd3a328f992c7d8aaebf1e8 tree 86f5508d38d2f3b2e0f0d5b528fb27edef431b0f parent 2a24ab628aa7b190be32f63dfb6d96f3fb61580a author Stephen Rothwell Wed, 25 May 2005 13:41:26 +1000 committer Linus Torvalds Wed, 25 May 2005 10:13:42 -0700 [PATCH] ppc64: fix initialisation of gettimeofday calculations On PPC64, we keep track of when we need to update jiffies (and the variables used to calculate the time of day) based on the time base. If the time base frequence is sufficiently high compared to the processor clock frequency, then it is possible for the time of day variables to be corrupted at the time of the first decrementer interrupt we take. This became obvious on a legacy iSeries where the time base frequency is the same as the processor clock. This one line patch fixes the initialisation so that the time of day variables and the indicator we use to tell when updates are due are better synchronised. Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 6df16d0c35b9c0d3627f30c106e6142d3d12662b tree 40b6208b97f200b91b268f69e81bf074236e2410 parent 7e43c84e3e5423ae72ae31e4cd7bbccfd1605194 parent 816242da3735957bee99aeba40aa60c4f120a101 author David S. Miller Tue, 24 May 2005 18:08:07 -0700 committer David S. Miller Tue, 24 May 2005 18:08:07 -0700 Merge of davem@nuts.davemloft.net:/disk1/GIT/sparc-2.6/.git/ commit 9092f46b5aed4515d9a427d5dab3be1584851f07 tree 3723469c5f2af23e29e7c25036d1cdca893f90b9 parent 187a1a94d629621d1471b42308e63573b1150773 author John W. Linville Wed, 18 May 2005 13:41:33 -0400 committer Jeff Garzik Tue, 24 May 2005 00:26:12 -0400 [PATCH] tulip: add return to ULI526X clause in tulip_mdio_write The 'if' clause for ULI526X in tulip_mdio_write allows for spin_unlock_irqrestore to be called twice for tp->mii_lock. I believe this is caused by the unintentional omission of a return at the end of that clause. This patch adds that return. Signed-off-by: John W. Linville commit 816242da3735957bee99aeba40aa60c4f120a101 tree c5a1092a52911143b0c4f9bc4257c1dbafbb8bdd parent ab3fc403633c38aef5ef48844f8e5dbfee7c34f8 author David S. Miller Mon, 23 May 2005 15:52:08 -0700 committer David S. Miller Mon, 23 May 2005 15:52:08 -0700 [SPARC64]: Add boot option to force UltraSPARC-III P-Cache on. Older UltraSPARC-III chips have a P-Cache bug that makes us disable it by default at boot time. However, this does hurt performance substantially, particularly with memcpy(), and the bug is _incredibly_ obscure. I have never seen it triggered in practice, ever. So provide a "-P" boot option that forces the P-Cache on. It taints the kernel, so if it does trigger and cause some data corruption or OOPS, we will find out in the logs that this option was on when it happened. Signed-off-by: David S. Miller commit 1bcd315362e215a72b56d1330bbf32f1c74eefb5 tree ceffa79b4dee4b9a489015afaad9574fed7b9742 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Don Fry Fri, 29 Apr 2005 14:51:17 -0700 committer Jeff Garzik Sun, 15 May 2005 18:22:29 -0400 [PATCH] pcnet32: fix resource leak with loopback test When running the loopback test, resources are not properly released on completion. This patch frees all transmit resources after running the loopback test. Tested on ia32 and ppc64 hardware. Signed-off-by: Don Fry commit 962082b6df11fe8cabafd2971b07c914cd52ee2a tree b6c1cf72db43fbb5064cc91d3d07a4ffb68a6b0c parent 6bdacb1ad58bb6b772a4fc18f21684437bd5f439 author Malli Chilakala Thu, 28 Apr 2005 19:19:46 -0700 committer Jeff Garzik Thu, 12 May 2005 20:59:28 -0400 [PATCH] e100: Performance optimizations to e100 Tx Path Performance optimizations to e100 Tx Path Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 6bdacb1ad58bb6b772a4fc18f21684437bd5f439 tree 5e725858fcb9783c8c88986c1fa16d02ecdeebcb parent 0236ebb7ae85935b3b96eef7e8a4e203ea9958a0 author Malli Chilakala Thu, 28 Apr 2005 19:17:54 -0700 committer Jeff Garzik Thu, 12 May 2005 20:59:28 -0400 [PATCH] e100: Fix Wake on lan related issues Fix Wake on lan related issues Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 1f53367d5d75ba37f258f6e955d6fc24814051a0 tree 05f5c9c8f79edb4d6a7b8465e46992de3941b10a parent 2acdb1e05c1a92e05ee710ed8f226a8f3183d5a0 author Malli Chilakala Thu, 28 Apr 2005 19:17:20 -0700 committer Jeff Garzik Thu, 12 May 2005 20:59:28 -0400 [PATCH] e100: Render e100 NAPI state machine Render e100 NAPI state machine to be similar to the non-NAPI one. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 042e2fb70006f135469d546726451b7d14768980 tree adb6d0eeb183e74c6bbac4f07a0e1699c4add156 parent 962082b6df11fe8cabafd2971b07c914cd52ee2a author Malli Chilakala Thu, 28 Apr 2005 19:20:14 -0700 committer Jeff Garzik Thu, 12 May 2005 20:59:28 -0400 [PATCH] e100: Driver version, white space, comments, device id Driver version, white space, comments. Also enabled ICH-7 support Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 0236ebb7ae85935b3b96eef7e8a4e203ea9958a0 tree 040bae76d6b77d5a3ee3a5ba70b0de55df169a5d parent 1f53367d5d75ba37f258f6e955d6fc24814051a0 author Malli Chilakala Thu, 28 Apr 2005 19:17:42 -0700 committer Jeff Garzik Thu, 12 May 2005 20:59:28 -0400 [PATCH] e100: Synchronize interface link state with poll routine Synchronize interface link state with e100 poll routine Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit 2acdb1e05c1a92e05ee710ed8f226a8f3183d5a0 tree e977185205ec68361d83c1e05b51b46174213628 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Malli Chilakala Thu, 28 Apr 2005 19:16:58 -0700 committer Jeff Garzik Thu, 12 May 2005 20:59:27 -0400 [PATCH] e100: Execute tx_timeout task outside interrupt context Execute tx_timeout task outside the interrupt context Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak commit f404de1cd407c1f56fa478810c6c48e015d377bd tree e7a40872bc886c7b1b784624402663eb1239f527 parent c2eba932b14718e34ac2609e35c6d41e032a2478 author Malli Chilakala Thu, 28 Apr 2005 19:04:54 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:42 -0400 [PATCH] ixgb: Code optimization Code optimization Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit c2eba932b14718e34ac2609e35c6d41e032a2478 tree 9e18fd51bd7bf99e1d85eb3bc63021232469b03b parent 5e3c30deb21d0eb0da44830fb1c1fc7054e54229 author Malli Chilakala Thu, 28 Apr 2005 19:04:32 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:42 -0400 [PATCH] ixgb: Remove hook for suspend, no power management Remove hook for suspend. No power management in 10GbE Controllers Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit ac79c82e793bc2440c4765e5eb1b834d2c18edf2 tree 39a7c23fbb6ba9be73b7aacfebf24d3bfb68ef10 parent 37d16f823799918107440cb9e552b0709347f77c author Malli Chilakala Thu, 28 Apr 2005 19:05:32 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:42 -0400 [PATCH] ixgb: Driver version, white space, comments, device id Driver version, white space, comments, device id & other Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 5e3c30deb21d0eb0da44830fb1c1fc7054e54229 tree 5dad3ce257e4f14caf8ef3cc93e404b1a04ae33d parent abf481d6af8670c89f33f354c6fbd9977b23cebc author Malli Chilakala Thu, 28 Apr 2005 19:04:07 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:42 -0400 [PATCH] ixgb: Support for ethtool -d ixgb support for ethtool -d Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ethtool.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ethtool.c commit 37d16f823799918107440cb9e552b0709347f77c tree 427355cfc97b90cc1debce5496749d625cd9ba74 parent f404de1cd407c1f56fa478810c6c48e015d377bd author Malli Chilakala Thu, 28 Apr 2005 19:05:12 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:42 -0400 [PATCH] ixgb: Fixed msec_delay in osdep to use msleep Fixed msec_delay in osdep to use msleep Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_osdep.h net-drivers-2.6/drivers/net/ixgb.new/ixgb_osdep.h commit abf481d6af8670c89f33f354c6fbd9977b23cebc tree fc604f98db1a85be2c025c10192fd6cb767c29aa parent 41639fed1b32dde4ea3d94242a89308435d341be author Malli Chilakala Thu, 28 Apr 2005 19:03:32 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:41 -0400 [PATCH] ixgb: Fix EEPROM functions to be endian-aware Fix EEPROM functions to be endian-aware Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_ee.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_ee.c commit 6dfbb6dd391139be9f1cd333877c6e2b03da4bba tree 2c2d4e22e332eb6602c294b7e65d63031e2db436 parent 0c73f58636385a4d3dc68d0d0829d4c39d61b621 author Malli Chilakala Thu, 28 Apr 2005 18:56:40 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:41 -0400 [PATCH] ixgb: Mask RXO interrupt Disable RXO interrupt to decrease recovery time when system is overloaded with data Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 5633684d008b777ab169e8efcef39a898482f531 tree c031a223e9ef9159f9f4982b042652ed768b4672 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Malli Chilakala Thu, 28 Apr 2005 18:45:50 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:41 -0400 [PATCH] ixgb: Fix multi-cast packet count in statistics Fix multi-cast packet count in statistics Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 41639fed1b32dde4ea3d94242a89308435d341be tree 2e8232795eff9e0a2b6c6b3d22c0532c472c749d parent 6dfbb6dd391139be9f1cd333877c6e2b03da4bba author Malli Chilakala Thu, 28 Apr 2005 18:51:54 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:41 -0400 [PATCH] ixgb: Reset status in the Rx Reset status in the Rx descriptor prior to handing it to the controller. Leave three Rx descriptors unused Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 0c73f58636385a4d3dc68d0d0829d4c39d61b621 tree c27c1632dc2b55dbbe5e33fbe0a736176da70196 parent 06c2f9ecb5b53f9d4fc1ef596da16683cc4af5ba author Malli Chilakala Thu, 28 Apr 2005 18:48:06 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:41 -0400 [PATCH] ixgb: Change RDT write bump size to 4 Change RDT write bump size back to 4 Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb.h net-drivers-2.6/drivers/net/ixgb.new/ixgb.h commit 06c2f9ecb5b53f9d4fc1ef596da16683cc4af5ba tree 9117d948a668e0c9f795678fec6a25d97af6f4e7 parent 5633684d008b777ab169e8efcef39a898482f531 author Malli Chilakala Thu, 28 Apr 2005 18:46:51 -0700 committer Jeff Garzik Thu, 12 May 2005 20:54:41 -0400 [PATCH] ixgb: Do not set the RS bit on context descriptors Don't set the RS bit on context descriptors, causes un-necessary bus activity Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/ixgb/ixgb_main.c net-drivers-2.6/drivers/net/ixgb.new/ixgb_main.c commit 2648345fcbadfae8e7113112ff9402e465a184dc tree ed615c4e72328e4ba137d700d341c96b7e611229 parent 1125ecbc0a89db07bb4eb1ba892a23367c3bdeb5 author Malli Chilakala Thu, 28 Apr 2005 19:44:46 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:55 -0400 [PATCH] e1000:Driver version,white space,comments,device id Driver version, white space, comments, device id & other Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c commit 1125ecbc0a89db07bb4eb1ba892a23367c3bdeb5 tree 5302b4334c8f1f9ed6984231101e97e761b8b903 parent 0e6ef3e02b6f07e37ba1c1abc059f8bee4e0847f author Malli Chilakala Thu, 28 Apr 2005 19:44:25 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:55 -0400 [PATCH] e1000:Adjust flow control watermarks for Jumbo Frames Adjust flow control watermarks for Jumbo Frames Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit f1d2e4905eed4b13c3ba56ac6d30c283be996963 tree b852be3add7242e2c667188a0fb7ed5300a8081a parent 97338bde27d97347bc83203d6ac5e93be1ebcd03 author Malli Chilakala Thu, 28 Apr 2005 19:42:04 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:54 -0400 [PATCH] e1000:Removed redundant statement in e1000_clean_tx_irq Removed redundant statement in e1000_clean_tx_irq Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit f0d11ed0b0650d2f93f56f65167c10a577c16c88 tree 323348d8a7a272ea33be40168cee46c0f1bc13a8 parent f1d2e4905eed4b13c3ba56ac6d30c283be996963 author Malli Chilakala Thu, 28 Apr 2005 19:43:28 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:54 -0400 [PATCH] e1000: Modified e1000_clean: exit poll Modified e1000_clean:: exit poll if no Tx and work_done == 0 Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 97338bde27d97347bc83203d6ac5e93be1ebcd03 tree a2897ca9e0ea40ef14ea1bcb4af69769021e9414 parent a4cb847dac40577dd751a4deb4085ed080780679 author Malli Chilakala Thu, 28 Apr 2005 19:41:46 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:54 -0400 [PATCH] e1000: Implement a workaround for 82546 errata 10 Implement 82546 errata 10 -- first Tx descriptor cannot have more than 2015 byte of data in it or it could hang the transmitter. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 2d7edb923a823660b081bd4c660300ee19adca8d tree 3442b72425638e8530d31490339567d42706534a parent f0d11ed0b0650d2f93f56f65167c10a577c16c88 author Malli Chilakala Thu, 28 Apr 2005 19:43:52 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:54 -0400 [PATCH] e1000:82573 specific code & packet split code 82573 specific code & packet split code Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h commit 0e6ef3e02b6f07e37ba1c1abc059f8bee4e0847f tree 4382fe850661782004eabab9194d894a35fb3b2b parent 2d7edb923a823660b081bd4c660300ee19adca8d author Malli Chilakala Thu, 28 Apr 2005 19:44:14 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:54 -0400 [PATCH] e1000:Fix Packet Buffer Allocation logic for 82547_rev_2 Fix Packet Buffer Allocation logic for 82547_rev_2 controller Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit a4cb847dac40577dd751a4deb4085ed080780679 tree 673dcbdd4bd65d32b9181ad61779b0788b36e8de parent 6d9157577d926d2a83fe8d4914c0cc216deb5842 author Malli Chilakala Thu, 28 Apr 2005 19:41:28 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:53 -0400 [PATCH] e1000: e1000 stops working after resume e1000 stops working after resume, call pci_enable_device after pci_restore_state - Modified Andrew Morton's patch Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 70b8f1e16a788eccdd36f39679774b1a08a6ba55 tree ec8314d660c96cff7b594fd0d157a26115e23818 parent 2701234fc0372630457e3da14e36cde53c57d12e author Malli Chilakala Thu, 28 Apr 2005 19:40:40 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:53 -0400 [PATCH] e1000: Dump information on Tx ring Dump information on Tx ring when 'NETDEV: Watchdog' condition is reached Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 6d9157577d926d2a83fe8d4914c0cc216deb5842 tree 70082b81242a849a62091d18389acafa7bb76b80 parent 70b8f1e16a788eccdd36f39679774b1a08a6ba55 author Malli Chilakala Thu, 28 Apr 2005 19:41:11 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:53 -0400 [PATCH] e1000:Fix computation of netdev stats from controller stats counters Fix computation of netdev stats from controller stats counters - from sfeldma@pobox.com Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 5de556249fde97493a4c79dbf8979ace0f76789f tree a64f68956aeaad6ebf6409a5b5cbd38a4541c7a8 parent fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07 author Malli Chilakala Thu, 28 Apr 2005 19:39:30 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:53 -0400 [PATCH] e1000: Enable polling before enabling interrupts Enable polling before enabling interrupts -- avoids (in NAPI mode) entering the ISR and returning without doing any work because polling is not enabled. [romieu@fr.zoriel.com] Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 4e48a2b91d408357cb0747151d8db5368ac8f1d0 tree 600d1e3fdec1ef85d08eb7bf286a015ac308f09b parent 5de556249fde97493a4c79dbf8979ace0f76789f author Malli Chilakala Thu, 28 Apr 2005 19:39:53 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:53 -0400 [PATCH] e1000: Fix kernel panic with 82541 LOM Fix kernel panic with 82541 LOM when using a 100M cable Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit 2701234fc0372630457e3da14e36cde53c57d12e tree c95073b15f364a3528da2d5ff40bad66e8de22ac parent 4e48a2b91d408357cb0747151d8db5368ac8f1d0 author Malli Chilakala Thu, 28 Apr 2005 19:40:28 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:53 -0400 [PATCH] e1000: Delay clean-up of last Tx packet Delay clean-up of last Tx packet to fix pre-mature writeback issue of Tx descriptors only when TSO is enabled Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_main.c net-drivers-2.6/drivers/net/e1000.new/e1000_main.c commit fa4f7ef3aaa6cee6b04ebe90266ee893e0b2ce07 tree 3a1ec2dbb7f0298b0de9db2b815bf7b1d2c4936c parent df25e164878836196ee93d1a5757867da6eac30e author Malli Chilakala Thu, 28 Apr 2005 19:39:13 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:52 -0400 [PATCH] e1000: MSI support for PCI-e adapters MSI support for PCI-e adapters Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000.h net-drivers-2.6/drivers/net/e1000.new/e1000.h commit e4eff7291c977308989b24fdfc7215a501302e6a tree c773bc7d11aaf8acf8928c801afc34561818bc53 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Malli Chilakala Thu, 28 Apr 2005 19:38:30 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:52 -0400 [PATCH] e1000: made loopback test robust Added enhanced functionality to the loopback diags to wrap the descriptor rings. Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_ethtool.c net-drivers-2.6/drivers/net/e1000.new/e1000_ethtool.c commit df25e164878836196ee93d1a5757867da6eac30e tree 56a76255f8a7e30ffcba14432f408ce8b5a99917 parent e4eff7291c977308989b24fdfc7215a501302e6a author Malli Chilakala Thu, 28 Apr 2005 19:38:43 -0700 committer Jeff Garzik Thu, 12 May 2005 20:48:52 -0400 [PATCH] e1000: Fix msec-delay definition to use msleep Fix msec-delay definition in e1000_osdep.h to use msleep Signed-off-by: Mallikarjuna R Chilakala Signed-off-by: Ganesh Venkatesan Signed-off-by: John Ronciak diff -up net-drivers-2.6/drivers/net/e1000/e1000_osdep.h net-drivers-2.6/drivers/net/e1000.new/e1000_osdep.h commit dfa1b73ffb414b64dc0452260132a090eb25bf52 tree d01ca6357ecdeb874bcf8ff3ea9a2131afd41862 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Liu Tao Thu, 12 May 2005 19:40:38 -0400 committer Jeff Garzik Thu, 12 May 2005 19:40:38 -0400 [PATCH] drivers/net/amd8111e.c: fix NAPI interrupt in poll This patch makes the netif_rx_complete() and rx_interrupt_enable atomic when exiting the poll() method, so to avoid interrupt in poll. It also fixes the rx interrupt check logic in interrupt handler. Signed-off-by: Liu Tao Signed-off-by: Jeff Garzik