commit 7eb9b2f56c9812d03ac63031869bcc42151067b1 tree c9e1ae248e586b9ca3ac0420c88c1b171dca47af parent 728c7763e7234cf8d34fa159660df736556563c9 parent d88992f660936049f5f38d74ea5a86b5c1491a48 author Linus Torvalds Tue, 17 Jan 2006 19:48:07 -0800 committer Linus Torvalds Tue, 17 Jan 2006 19:48:07 -0800 Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 commit 728c7763e7234cf8d34fa159660df736556563c9 tree fe66af9029dd1aea787d2a231a82dcaf5dc4c9ee parent d1138cf035ad5a8dc0796b213bd078a2fb92eb7c parent a1bd9e68573239320d18823c73eb06d8e56cc9e2 author Linus Torvalds Tue, 17 Jan 2006 19:47:31 -0800 committer Linus Torvalds Tue, 17 Jan 2006 19:47:31 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit d1138cf035ad5a8dc0796b213bd078a2fb92eb7c tree 72a4640fe87720ebfc118f2b3c7f140f5d19d6b7 parent 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b parent 77783a78ded96a56e3a1a0c03bbe87c56896fe6e author Linus Torvalds Tue, 17 Jan 2006 19:46:46 -0800 committer Linus Torvalds Tue, 17 Jan 2006 19:46:46 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 commit d88992f660936049f5f38d74ea5a86b5c1491a48 tree 3c3ac2e25d33e4bd59193b9d4ecf7a1bee3e4d0e parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author David Chinner Wed, 18 Jan 2006 13:38:12 +1100 committer Nathan Scott Wed, 18 Jan 2006 13:38:12 +1100 [XFS] Fix a race in xfs_submit_ioend() where we can be completing I/O for a page while we are still submitting other buffers on the same page for I/O. SGI-PV: 948197 SGI-Modid: xfs-linux-melb:xfs-kern:25004a Signed-off-by: David Chinner Signed-off-by: Nathan Scott commit 15578eeb6cd4b74492f26e60624aa1a9a52ddd7b tree d938e61f953ca63a745e7ace4a78c16876509ed5 parent 8f28afac3494f573ac774030a1f840b7d6237da2 parent 3860288ee8298bf2784e9a0c37d26d3a82941e35 author Linus Torvalds Tue, 17 Jan 2006 17:32:22 -0800 committer Linus Torvalds Tue, 17 Jan 2006 17:32:22 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 8f28afac3494f573ac774030a1f840b7d6237da2 tree 3a405d14b578d4d3b7bf1884667ad43022cc65f2 parent c6b3feaf5774508ab5a955a81e45ffefa3b12eaa parent 4f3f2f6f3e7ce68c533e7786114f05181772ff6f author Linus Torvalds Tue, 17 Jan 2006 17:19:53 -0800 committer Linus Torvalds Tue, 17 Jan 2006 17:19:53 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit c6b3feaf5774508ab5a955a81e45ffefa3b12eaa tree f2b275db2e425b1441f9a1ab40a377a232c2bc38 parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Bryan O'Sullivan Tue, 17 Jan 2006 17:00:05 -0800 committer Linus Torvalds Tue, 17 Jan 2006 17:18:25 -0800 [PATCH] Fix sparse parse error in lppaca.h sparse can't parse a struct definition in include/asm-powerpc/lppaca.h, even though gcc can accept it. The form looks like this: struct __attribute__((whatever)) foo { }; An equivalent that both gcc and sparse can handle is struct foo { } __attribute__((whatever)); This is the only definition of this type in the tree, and fixing it is easier than fixing sparse. Signed-off-by: Bryan O'Sullivan [ Side note: fixing sparse wouldn't be hard, but the "attribute at the end" version is the canonical one, and the one that makes sense. So let's just fix the kernel instead. Luc Van Oostenryck already sent out a sparse patch to the sparse mailing list in case anybody cares. -- Linus ] Signed-off-by: Linus Torvalds commit 77783a78ded96a56e3a1a0c03bbe87c56896fe6e tree 6a18c269adc45b438dc77355756dcf3957d4aad3 parent 22d4d77183f0af8b3b643544a5ae64ec6105d88b author Stephen Hemminger Thu, 05 Jan 2006 16:26:05 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:52:56 -0500 [PATCH] skge: fix dma mask setup. There are a couple of problems in the DMA setup code for skge. * In the 64 bit case, it doesn't set the consistent mask. * In the 32 bit case, the error check is backwards! It likely will only be visible as a bug on 64 bit platforms. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a1bd9e68573239320d18823c73eb06d8e56cc9e2 tree 9c9138c9239c586a66fd372549544254d10304e4 parent 9d824d0710a9e780451533ae4c5cdc5c2ff9062e author Alan Cox Tue, 17 Jan 2006 20:53:50 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:37:45 -0500 [PATCH] libata: Code for the IRQ mask flag Signed-off-by: Alan Cox Somewhat cleaner in the resync as someone cleaned up the pio xfer users Signed-off-by: Jeff Garzik commit 9d824d0710a9e780451533ae4c5cdc5c2ff9062e tree b786d00ffce075c3f2031d672cccd3814ba01a53 parent 8d238e012469a9a332c78d6a69a8a46ac4b1e9c2 author Alan Cox Tue, 17 Jan 2006 20:51:55 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:37:45 -0500 [PATCH] libata: Fix sector lock to apply to both drives not drive 0 twice Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 8d238e012469a9a332c78d6a69a8a46ac4b1e9c2 tree a882e4ec38a87d5ee61653ff9b16ccea57c2bf04 parent 012b265f76ce5d497b182569dc77f2c68662bead author Alan Cox Tue, 17 Jan 2006 20:50:31 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:37:45 -0500 [PATCH] libata: Fix heuristic typos add LBA48PIO flag and support code, add IRQ flag for next diff Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 012b265f76ce5d497b182569dc77f2c68662bead tree e361d2f2208983c66c9110fce91bb7213f62976a parent 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 author Jason Gaston Tue, 17 Jan 2006 12:28:48 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:31:54 -0500 [PATCH] Intel ICH8 SATA: add PCI device IDs Signed-off-by:  Jason Gaston Signed-off-by: Jeff Garzik commit 22d4d77183f0af8b3b643544a5ae64ec6105d88b tree 147b99fdd2dcbaeeac0f23e67bfa0147d23748bc parent 0570cc08194630bd78aef7c2c2b4f6a3f02c2bba author Alan Cox Tue, 17 Jan 2006 17:53:56 +0000 committer Jeff Garzik Tue, 17 Jan 2006 19:28:50 -0500 [PATCH] Fix warning with b44.c on 64bit boxes sizeof() return is not an int, so use max_t to get the types right. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0570cc08194630bd78aef7c2c2b4f6a3f02c2bba tree d8b98dc9709b9f28fc0aef3d5052bc9271930ea1 parent 302d12522a36790858ce93b69ebf2220f9e5173a author Stephen Hemminger Tue, 17 Jan 2006 13:43:21 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:31 -0500 [PATCH] sky2: 0.13 version Signed-off-by: Jeff Garzik commit 302d12522a36790858ce93b69ebf2220f9e5173a tree 29b049801298aff6e889f9c15bcd5963cb33aebc parent 28bd181a8e4abf1126de56f0934ba7c910276475 author Stephen Hemminger Tue, 17 Jan 2006 13:43:20 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: more conservative transmit locking Be more careful about transmit locking, this solves a possible race between tx_complete and transmit, that would cause a tx timeout. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 28bd181a8e4abf1126de56f0934ba7c910276475 tree e9e938691446ada18cae5d8dafaa2d79b00f12ce parent 6aad85d6730d47d4867f24eeda517766aa89f8d0 author Stephen Hemminger Tue, 17 Jan 2006 13:43:19 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: don't inline so much Don't need to inline quite so many routines, let the compiler decide Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 6aad85d6730d47d4867f24eeda517766aa89f8d0 tree 4bc4dff2f0dad994abb3bca18b710ce85f14546a parent 3be92a70237a1bd813e46d6683a55b508627013a author Stephen Hemminger Tue, 17 Jan 2006 13:43:18 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: use kzalloc Can use kzalloc here. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3be92a70237a1bd813e46d6683a55b508627013a tree 1a7995f8b2c646e892f36543a0d70626b7b93aa5 parent a036119f977eeeae2089ddf5b4759de9ca5fbdb6 author Stephen Hemminger Tue, 17 Jan 2006 13:43:17 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: ratelimit error messages Make sure and rate limit all the error messages that might occur. If a problem occurs then a few messages are enough. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a036119f977eeeae2089ddf5b4759de9ca5fbdb6 tree b2375e6d37a5e79fb1a3e890c00c15c15ca2d57a parent dc4d5ea2218b80eb8cd323082f09c506ba75fb6f author Stephen Hemminger Tue, 17 Jan 2006 13:43:16 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:30 -0500 [PATCH] sky2: optimize for 32 bit dma Small optimization, if dma addresses are 32 bits, then high bits are always zero. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit dc4d5ea2218b80eb8cd323082f09c506ba75fb6f tree 67ddc5608641b91b05a066a3dd34c9e80908e504 parent 762c2de2e61ef5f3c866d00861e6b1509cd8eacf author Stephen Hemminger Tue, 17 Jan 2006 13:43:15 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: don't bother clearing status ring elements Don't need to zero out the status ring entries after processing. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 762c2de2e61ef5f3c866d00861e6b1509cd8eacf tree 7e995313877766e8013fa03b8305fbaa1139b808 parent 1c28f6ba600d05be2dc7ab0592e4d845f668a485 author Stephen Hemminger Tue, 17 Jan 2006 13:43:14 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: write barrier's Be more careful about memory barriers. The only place we really need them is before and after updating the chip's ring interface. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 1c28f6ba600d05be2dc7ab0592e4d845f668a485 tree 4dab29ea4d4d83588ef478ac34d5f99961416b45 parent e0c94455ce2a0e5734eeb236fb49a4613e20e7b0 author Stephen Hemminger Tue, 17 Jan 2006 13:43:13 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: fix ram buffer for Yukon FE rev 2 Fix problems with Yukon FE rev 2 chipset. Don't cut and paste bugs in from sk98lin driver. Change how the ram buffer is divided up, and make the math clearer. Also, set the thresholds where rx takes precedence. The threshold values are just guesses at this point, it might be worth tuning them later. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit e0c94455ce2a0e5734eeb236fb49a4613e20e7b0 tree 431f470cf0cc5deb4c4b8e27758e8b37c5cb2102 parent d1f3d4ddddc3c86e25ce2a41dc129cbe10e24991 author Stephen Hemminger Tue, 17 Jan 2006 13:43:12 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: version 0.12 Version update. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit d1f3d4ddddc3c86e25ce2a41dc129cbe10e24991 tree 61da5eb8cf7c8424fbb66a2ab59635985136bdbf parent 82788c7a47e50ee8d42e3be23afb23448d651c4c author Stephen Hemminger Tue, 17 Jan 2006 13:43:11 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:29 -0500 [PATCH] sky2: call pci_set_consistent_dma_mask Need to call pci_set_consistent_dma_mask in the case of 64 bit DMA. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 82788c7a47e50ee8d42e3be23afb23448d651c4c tree 90c7f6e7f6a1755914677d33a7899e7d82376f9f parent 0547993820378ef8140b0470b604737bf1fa6c85 author Stephen Hemminger Tue, 17 Jan 2006 13:43:10 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:27:28 -0500 [PATCH] sky2: receive buffer alignment Need to make sure that sky2 receive buffers are 64 bit aligned. Also, don't need to start off with GFP_ATOMIC on initial setup. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 0547993820378ef8140b0470b604737bf1fa6c85 tree ac942ba856056d984a6b204c50b1f33b4fcc12cd parent 3435dbcec199740d3100e0a2f316e795286b5424 author Jesse Brandeburg Tue, 17 Jan 2006 15:01:10 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:15:16 -0500 [PATCH] e100: e100 whitespace fixes e100: e100 whitespace fixes These are whitespace only fixes. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 3435dbcec199740d3100e0a2f316e795286b5424 tree 4cdce308bb06510dd5cf1e4de68e792565b08b03 parent 24180333206519e6b0c4633eab81e773b4527cac author Jesse Brandeburg Tue, 17 Jan 2006 15:01:08 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:15:15 -0500 [PATCH] e100: Handle the return values from pci_* functions e100: Handle the return values from pci_* functions This is to resolve warnings during compile time. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 24180333206519e6b0c4633eab81e773b4527cac tree 903edfa6bac60f0583a69614503a6ee1af2711a4 parent 2610c733023850be2db9fef9c81f851a64bb9f67 author Jesse Brandeburg Tue, 17 Jan 2006 15:01:06 -0800 committer Jeff Garzik Tue, 17 Jan 2006 19:15:15 -0500 [PATCH] e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue) e100: Fix TX hang and RMCP Ping issue (due to a microcode loading issue) Set the end of list bit to cause the hardware's transmit state machine to work correctly and not prevent management (BMC) traffic. Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 4f3f2f6f3e7ce68c533e7786114f05181772ff6f tree 7035a782b79c770f98d34847ae0b88b3ad6b8384 parent c7006638a50cbf16bb420fa91e5af2dd22d28621 author David S. Miller Tue, 17 Jan 2006 15:55:58 -0800 committer David S. Miller Tue, 17 Jan 2006 15:55:58 -0800 [SOUND]: sparc/cs4231: Fix some typos which wrecked the build. Signed-off-by: David S. Miller commit c7006638a50cbf16bb420fa91e5af2dd22d28621 tree ba8a5d030087634a2e0fe63ad6ce1cd9c6758bbf parent 1ae613883468eab2fb8a077aad9fdedfbfa73d1b author David S. Miller Tue, 17 Jan 2006 15:53:11 -0800 committer David S. Miller Tue, 17 Jan 2006 15:53:11 -0800 [SPARC]: Fix sbusfb build. sbusfb_compat_ioctl() needs to return int, not long, as that is what the fb_ops->fb_compat_ioctl method prototype wants. Need to git rid of the "struct file *file" first argument to fbiogetputcmap() and fbiogscursor() to match calls done in sbusfb_compat_ioctl(). Signed-off-by: David S. Miller commit 1ae613883468eab2fb8a077aad9fdedfbfa73d1b tree 137e13bddb040f4ae9a997473e847304dcd7c19e parent 9eb3394bf2037120881a8846bc67064f49325366 author Eric Sesterhenn Tue, 17 Jan 2006 15:36:05 -0800 committer David S. Miller Tue, 17 Jan 2006 15:36:05 -0800 [SPARC]: change if() BUG(); to BUG_ON in iommu.c this patch changes if() BUG(); constructs in iommu.c to BUG_ON(); so it gets save to define BUG() and BUG_ON() to nullstatements. Signed-off-by: Eric Sesterhenn Signed-off-by: David S. Miller commit 9eb3394bf2037120881a8846bc67064f49325366 tree 6782663f5b5a13cf8f98c4341637322650b42f9a parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Richard Mortimer Tue, 17 Jan 2006 15:21:01 -0800 committer David S. Miller Tue, 17 Jan 2006 15:21:01 -0800 [SPARC64]: Eliminate race condition reading Hummingbird STICK register Ensure a consistent value is read from the STICK register by ensuring that both high and low are read without high changing due to a roll over of the low register. Various Debian/SPARC users (myself include) have noticed problems with Hummingbird based systems. The symptoms are that the system time is seen to jump forward 3 days, 6 hours, 11 minutes give or take a few seconds. In many cases the system then hangs some time afterwards. I've spotted a race condition in the code to read the STICK register. I could not work out why 3d, 6h, 11m is important but guess that it is due to the 2^32 jump of STICK (forwards on one read and then the next read will seem to be backwards) during a timer interrupt. I'm guessing that a change of -2^32 will get converted to a large unsigned increment after the arithmetic manipulation between STICK, nanoseconds, jiffies etc. I did a test where I modified __hbird_read_stick to artificially inject rollover faults forcefully every few seconds. With this I saw the clock jump over 6 times in 12 hours compared to once every month or so. Signed-off-by: Richard Mortimer Signed-off-by: David S. Miller commit 3860288ee8298bf2784e9a0c37d26d3a82941e35 tree 418993a3f8a15e01a8678c5750399ac7a6ae6811 parent 64af4c13622511257daba762b32d9d20f2d0c4b5 author Kris Katterjohn Tue, 17 Jan 2006 15:15:38 -0800 committer David S. Miller Tue, 17 Jan 2006 15:15:38 -0800 [NET]: Use is_zero_ether_addr() in net/core/netpoll.c This replaces a memcmp() with is_zero_ether_addr(). Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit 64af4c13622511257daba762b32d9d20f2d0c4b5 tree b305487a9130b824f71418303178bd0b19791048 parent f404e9a67ffdc0bb0302a5ad1f7eaf58e5a59109 author Andrew Morton Tue, 17 Jan 2006 15:14:49 -0800 committer David S. Miller Tue, 17 Jan 2006 15:14:49 -0800 [CASSINI]: Fix printk warning. drivers/net/cassini.c:1930: warning: long unsigned int format, different type arg (arg 4) Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f404e9a67ffdc0bb0302a5ad1f7eaf58e5a59109 tree 4406dc808ccf1654c3648fcea12e68ff5a56fdee parent a8fc3d8decfd5601fb14a2163952f81fa6b971bb author Kris Katterjohn Tue, 17 Jan 2006 13:04:57 -0800 committer David S. Miller Tue, 17 Jan 2006 13:04:57 -0800 [PKTGEN]: Replacing with (compare|is_zero)_ether_addr() and ETH_ALEN This replaces some tests with is_zero_ether_addr(), memcmp(one, two, 6) with compare_ether_addr(one, two), and 6 with ETH_ALEN where appropriate. Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit a8fc3d8decfd5601fb14a2163952f81fa6b971bb tree 9666ef0fefde06061b0fc3e1a6ef3c1f8e9cfb0a parent ab67a4d511188680beb8a0d82a90f55dbeb53d5c author Kris Katterjohn Tue, 17 Jan 2006 13:03:54 -0800 committer David S. Miller Tue, 17 Jan 2006 13:03:54 -0800 [NET]: "signed long" -> "long" Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit ab67a4d511188680beb8a0d82a90f55dbeb53d5c tree c2a9842b9877df27a50448506c3cfe3a6f00f6df parent ae82af54d73becd66804d942cf39b049e625fa89 author Patrick McHardy Tue, 17 Jan 2006 13:01:31 -0800 committer David S. Miller Tue, 17 Jan 2006 13:01:31 -0800 [EBTABLES]: Handle SCTP/DCCP in ebt_{ip,log} Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit ae82af54d73becd66804d942cf39b049e625fa89 tree d987461ee9dfbfb963bb96052cf92bca176469ff parent 2f970d83576cf4938fd75551c465050f6a16c33c author Patrick McHardy Tue, 17 Jan 2006 13:01:06 -0800 committer David S. Miller Tue, 17 Jan 2006 13:01:06 -0800 [PKT_SCHED]: Handle SCTP/DCCP in sfq_hash Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 tree 03bd5a2d64c52dff3c68a66e37f43b4109854170 parent ffa29456cd316a5394cdd489de5af3bf87d3c485 author Alan Cox Mon, 09 Jan 2006 17:18:14 +0000 committer Jeff Garzik Tue, 17 Jan 2006 08:25:39 -0500 [PATCH] libata: add a function to decide if we need iordy This ought to be simple but for PIO2 we have to poke around the drive data to get it 100% correct. Signed-off-by: Jeff Garzik commit ffa29456cd316a5394cdd489de5af3bf87d3c485 tree d051d85afb7337bde4e536b16db0f48becf5692e parent 5a46fe89a73dc984a2b9ef0fde9b9e58bd4ff98f author Alan Cox Mon, 09 Jan 2006 17:14:40 +0000 committer Jeff Garzik Tue, 17 Jan 2006 08:25:39 -0500 [PATCH] libata: Pre UDMA EIDE PIO mode selection I misread the spec when doing the original. I've tested the corrected version with pre UDMA drives and it now picks the right modes. This is a specific bug fix rather than an update or new feature item. Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 5a46fe89a73dc984a2b9ef0fde9b9e58bd4ff98f tree 71e4811ed304d8c8db4f82bbc0d2fd51f71a2285 parent 88b52877fa1a8894600362a5c9addbab1fcf8b54 author Yusuf Iskenderoglu Tue, 17 Jan 2006 08:06:21 -0500 committer Jeff Garzik Tue, 17 Jan 2006 08:06:21 -0500 [libata] sata_promise: add pci id commit 2610c733023850be2db9fef9c81f851a64bb9f67 tree 62db077203a86e8b67cde10941f7034caed02c4e parent 38bd3b2629702894ca3528358ffc447bbacc9442 author Javier Achirica Tue, 17 Jan 2006 08:01:01 -0500 committer Jeff Garzik Tue, 17 Jan 2006 08:01:01 -0500 airo: Off-by-one channel fix commit 88b52877fa1a8894600362a5c9addbab1fcf8b54 tree 24522f6a3de5455c8e4730223c8a857822f62db5 parent f285757cab254470a10f711cd3cbaf9d92f7aa06 author Oliver Weihe Tue, 17 Jan 2006 07:58:42 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:58:42 -0500 [libata] sata_svw: add pci id commit f285757cab254470a10f711cd3cbaf9d92f7aa06 tree ad439542415d3b9118ae266f56319fd9ef1b3145 parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author Jason Gaston Mon, 09 Jan 2006 11:09:13 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:54:42 -0500 [PATCH] ahci: AHCI mode SATA patch for Intel ICH8 This patch adds the Intel ICH8 DID's to the ahci.c file for AHCI mode SATA support. Signed-off-by:  Jason Gaston Signed-off-by: Jeff Garzik commit 38bd3b2629702894ca3528358ffc447bbacc9442 tree a07e27fcd3fcc94dfb9fd6b204cc670f7d3b7ff6 parent 8241e35e0c6ae7531fe270de34608edfdc2ea483 author Jeff Kirsher Thu, 12 Jan 2006 16:51:37 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:51:04 -0500 [PATCH] e1000: Removed unused variables and initialized variables Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 8241e35e0c6ae7531fe270de34608edfdc2ea483 tree 9a87f5b49d41f3b37c6ae643fc5e3111ace5afde parent a292ca6efbc1f259ddfb9c902367f2588e0e8b0f author Jeff Kirsher Thu, 12 Jan 2006 16:51:34 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:51:03 -0500 [PATCH] e1000: Cleaned up code and removed hard coded numbers Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit a292ca6efbc1f259ddfb9c902367f2588e0e8b0f tree 02d26f87e4b3931c54923c5f97557eae0eff39f0 parent 240b1710f56b359685bc698e2a1473a2f3f2b8d7 author Jeff Kirsher Thu, 12 Jan 2006 16:51:30 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:51:03 -0500 [PATCH] e1000: Added copy break code Improves small packet performance with large amounts of reassembly being done in the stack. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 240b1710f56b359685bc698e2a1473a2f3f2b8d7 tree 150d74c7d736bde01f18edfee510cbe868f4fb87 parent fb3d47d4c4cd79eeddd0ee1b470e157840dccf21 author Jeff Kirsher Thu, 12 Jan 2006 16:51:28 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added variable to handle return values for pci_enable_* functions This was to fix compilation warnings. Also added log messages when pci_enable_* functions return with an error. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit fb3d47d4c4cd79eeddd0ee1b470e157840dccf21 tree 7328582b0ce82e9956b8fda1a129c6f6a335c368 parent a2917e22dcaa53e8ad2d8dc3bcfa55a4b04e6d0f author Jeff Kirsher Thu, 12 Jan 2006 16:51:25 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added PCIe bus information This is two patches, the first is adding additional bus information for the 8257{1|2|3} controllers. The second patch was orginally a community patch to print bus type/speed/width, and enhanced by us. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit a2917e22dcaa53e8ad2d8dc3bcfa55a4b04e6d0f tree 75114ad5813ca2eb417bbeb602ba66329832cf47 parent b7ee49db8b4b21dad3284d5507e7ea2946031f6e author Jeff Kirsher Thu, 12 Jan 2006 16:51:23 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added firmware version reporting for 8257{1|2|3} controllers The EEPROM image version is reported as a firmware version for these controllers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit b7ee49db8b4b21dad3284d5507e7ea2946031f6e tree 1608149c1afea7bb19888664f89d18c14e0d1e88 parent 72d64a436724da72f876c85a73895a622da6a673 author Jeff Kirsher Thu, 12 Jan 2006 16:51:21 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:04 -0500 [PATCH] e1000: Added hardware support for PCI express, 82546GB, and 82571 Fiber Added 82571 fiber to WOL fix for dual port adapters. Added support for 82546GB (Quad Copper). Added PCIe typedef for x2, igp cable length 115, and extended TX CTRL registers. Added parity error detection and PCIe CTRL registers. Added EEPROM config registers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 72d64a436724da72f876c85a73895a622da6a673 tree c59dde1b1c116036dfd4400b35df002549e4c9ec parent 1e613fd9d64aba9945ddb3b7f1107127ee8a9835 author Jeff Kirsher Thu, 12 Jan 2006 16:51:19 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Added cleaned_count to RX buffer allocation Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 1e613fd9d64aba9945ddb3b7f1107127ee8a9835 tree aa6de84f7790d96daffcb20a6ffc22ee498db724 parent e8da8be146e6043fb4b60a222be0014a0fb46d24 author Jeff Kirsher Thu, 12 Jan 2006 16:51:16 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Added interrupt auto mask support Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit e8da8be146e6043fb4b60a222be0014a0fb46d24 tree 7d0a184d6a1f02ad770e53034281cd15516cc46b parent ce7393b93502f52e2ef7259e9e9bc3b1a1fd6799 author Jeff Kirsher Thu, 12 Jan 2006 16:51:14 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Fix Netpoll issue Fixed an issue netpoll would error out during communication, generating the following error: --netdump[14973]: Got toomany timeouts in handshaking, ... Even after a kernel panic, netpoll requires two way communication to successfully transfer the crash log to the remote server. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit ce7393b93502f52e2ef7259e9e9bc3b1a1fd6799 tree 16f6e2b774929766aafe834f1749a5c9805fd774 parent ff14701350eef6df9b7fc0ae118e1689e141a54c author Jeff Kirsher Thu, 12 Jan 2006 16:51:12 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:03 -0500 [PATCH] e1000: Fixed frame size logic Simplified the logic used to assign the frame_size. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit ff14701350eef6df9b7fc0ae118e1689e141a54c tree 2c49417d650df54c2ce85d06fd4983df13ae1493 parent d74bbd3bbfd70470446e0d8153f91967d53c0798 author Jeff Kirsher Thu, 12 Jan 2006 16:51:10 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:02 -0500 [PATCH] e1000: Fix VLAN support Fixed VLAN support by switching control over to the firmware. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit d74bbd3bbfd70470446e0d8153f91967d53c0798 tree d09f79b0d7d4c3e63f9dbe038a5f3bdd9a091d84 parent 0fadb0597d240d4ed279042cab632d567510a1a3 author Jeff Kirsher Thu, 12 Jan 2006 16:51:07 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:48:02 -0500 [PATCH] e1000: Fix __pskb_pull_tail Fixed by moving code to correct location (for 82572 and 82571 controllers). Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 0fadb0597d240d4ed279042cab632d567510a1a3 tree 83786788f8bf5ef24b3b2cc871b84030c4d59fdf parent 47028635d17c7b9c7ffc67499be5fed579bdfe72 author Jeff Kirsher Thu, 12 Jan 2006 16:51:05 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:51 -0500 [PATCH] e1000: Fix collision distance Fixed the collision distance for 82543 controllers and newer. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 47028635d17c7b9c7ffc67499be5fed579bdfe72 tree 0ac186eda8ed3530f05af8323b06190b1bccf1a8 parent f5645110aa2ed2dcc3e0373821474506ed4dc512 author Jeff Kirsher Thu, 12 Jan 2006 16:51:03 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:51 -0500 [PATCH] e1000: Fix bit 22 (TXDCTL) for 82571 & 82572 controllers Removed duplicate code, TXDCTL and TXDCTL_COUNT_DESC are the same bit and there is no need to set it twice. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit f5645110aa2ed2dcc3e0373821474506ed4dc512 tree 9f613bb98018b7cb86df4f023ffa1dd77d659fd6 parent 392137fa9b966cf03f020f9a9a2619099b996266 author Jeff Kirsher Thu, 12 Jan 2006 16:51:01 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:51 -0500 [PATCH] e1000: Fix desc. clean up These were two separate community submitted patches. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 392137fa9b966cf03f020f9a9a2619099b996266 tree 4afd28f3f674919ec8b799740ebf39aae620e32d parent 997f5cbdded3d8282dc56b741d332e51014ea64b author Jeff Kirsher Thu, 12 Jan 2006 16:50:57 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix TX timeout logic Fixed the TX timeout logic to use "end of packet" rather than "next to clean". Updated message log. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 997f5cbdded3d8282dc56b741d332e51014ea64b tree e542e0cc14bba8ed70f52933bdd2dd6b76a94ced parent 66a2b0a30fcc37876d3639ea375a9d24649b53bf author Jeff Kirsher Thu, 12 Jan 2006 16:50:55 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix Desc. Rings and Jumbo Frames This patch contains two fixes. The first fix is to the tx and rx descriptor rings clean up process. The second fix is to jumbo frames, which cleans up the code logic and removes most of the fifo related limitations on jumbo frames. This is because the driver code now supports splitting a packet across multiple descriptors. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 66a2b0a30fcc37876d3639ea375a9d24649b53bf tree dab5bdcbf8d2db73cc22b1030bb679ad81eeffb9 parent f11b7f8535fab0f9196a7387e93dca5deaa5fff2 author Jeff Kirsher Thu, 12 Jan 2006 16:50:53 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix TX queue length based on link speed 10/100 speeds seem to have some problems reporting false tx timeouts especially at half duplex. Fixed by using a timeout factor to attempt to mitigate the false timeouts. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit f11b7f8535fab0f9196a7387e93dca5deaa5fff2 tree ff4f599bb8d8a7abd6d97d78756a9376f1bf8947 parent 4d351858e41145fa236730b7749e3aed18edef43 author Jeff Kirsher Thu, 12 Jan 2006 16:50:51 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix flow control water marks Fixed flow control water marks based on PBA size. Store flow control state in original_fc in addition to fc. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 4d351858e41145fa236730b7749e3aed18edef43 tree ecab4b750bc11feadcd5400bdbd516d0aa5a5c6b parent 526f99572e9f18f42c8da2c9adafbe64482c0737 author Jeff Kirsher Thu, 12 Jan 2006 16:50:48 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:50 -0500 [PATCH] e1000: Fix EEPROM read logic Fixed read_eeprom logic to test use_eerd instead of testing for 82573 controllers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 526f99572e9f18f42c8da2c9adafbe64482c0737 tree b6b76704aa4ca03d3b66eaedb34b3d77237dc7a0 parent 492731632cce0a7c8817376e1316f0af093830c4 author Jeff Kirsher Thu, 12 Jan 2006 16:50:46 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:49 -0500 [PATCH] e1000: Fix PHY reset when blocked Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 492731632cce0a7c8817376e1316f0af093830c4 tree 2b823e84446b2812067d4c47a62c8361bb7d8d84 parent 7bfa48162d4924e8cc7fb8eccc8c8f66cc111eb4 author Jeff Kirsher Thu, 12 Jan 2006 16:50:44 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:44:49 -0500 [PATCH] e1000: Fix loopback logic Fixed the loopback logic to work for the PCI express adapters. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7bfa48162d4924e8cc7fb8eccc8c8f66cc111eb4 tree 906365b7e1c17f15fa470dbad448cafa3310f011 parent f56799ea39a85a6f3760a134aa0e6d1c17eea369 author Jeff Kirsher Thu, 12 Jan 2006 16:50:41 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] e1000: Fix mulitple queues Fixed stats when using multiple queues. When multiple queues are enabled, log a message in syslog. Fixed memory allocation for multiple queues. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit f56799ea39a85a6f3760a134aa0e6d1c17eea369 tree 5d7ed643eb04aed2a7d5c129dd997e1f7d3cf76c parent d8c2bd3d3aa49e18ffebb999979b976f04280284 author Jeff Kirsher Thu, 12 Jan 2006 16:50:39 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] e1000: Fix adapter structure and prepare for multique fix Fix adapter structure to handle multiple queues and prepping the driver for full multiple queue support, some changes are ifdef'd our unless you define CONFIG_E1000_MQ. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit d8c2bd3d3aa49e18ffebb999979b976f04280284 tree a188305d413f0a54d1708a78c959fc45295cda2d parent 6b7660cd4df23ee92ddc0ba4b4ec31e3adee7bc9 author Jeff Kirsher Thu, 12 Jan 2006 16:50:37 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] e1000: Fix LED functionality for 82573 Fixed adapter identification issue. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 6b7660cd4df23ee92ddc0ba4b4ec31e3adee7bc9 tree 624a74e76fa9d5fdcc3f6c9142148cfaafc9a01d parent 7892f59c5ea86115450293441ca10654168e00da author Jeff Kirsher Thu, 12 Jan 2006 16:50:35 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:11 -0500 [PATCH] Fix e1000 stats Updated the e1000_stats structure and removed mpx for rx_errors and rx_dropped. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7892f59c5ea86115450293441ca10654168e00da tree 8bb3ee008714f43f1c3542335e2d4ac44032d9ea parent b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39 author Jeff Kirsher Thu, 12 Jan 2006 16:50:32 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix PHY config for 82573 controller Added a delay to allow PHY configuration to complete before accessing NVM. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit b55ccb356167ed2d2d40b9dc0fe05bbe1a3d6f39 tree 838628fd9bfbfc60f84f251fddd56edf6906b9a0 parent 571281972e2ca590ef160dcd6669b9f724b64283 author Jeff Kirsher Thu, 12 Jan 2006 16:50:30 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix ASF/AMT for 8257{1|2|3} controllers The 82573 controller required different logic than 82571|2 controllers. Corrected the reset logic for 8257{1|2|3} controllers. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 571281972e2ca590ef160dcd6669b9f724b64283 tree cdb4f140fee6c924257ea52d40c56c031101d018 parent 545c67c0a3550545fe50d28c874b0664bc5dc882 author Jeff Kirsher Thu, 12 Jan 2006 16:50:28 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix SoL/IDER link and loopback Fix so that if a SoL/IDER session is active, do not allow operations which require a PHY reset and instead log a message. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 545c67c0a3550545fe50d28c874b0664bc5dc882 tree e0ffa97a1137bccbdd0574434bf481cb6e52a56d parent 9a3056da0d7fde1e19e806824c41857b239954ed author Jeff Kirsher Thu, 12 Jan 2006 16:50:25 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: General Fixes These fixes update the TX and RX ring structures. Prepare driver for up-coming fixes. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 9a3056da0d7fde1e19e806824c41857b239954ed tree a416cf97788135fa3635a78c9c55f0624a10f837 parent 4ee9c02007249cf9c66e368b5d433c6956e05586 author Jeff Kirsher Thu, 12 Jan 2006 16:50:23 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:10 -0500 [PATCH] e1000: Fix TSO Fixed the TSO workaround for 82571/2 controllers. Fixed TSO issue where a non-tso packet in a linear SKB which followed a TSO packet would get written back prematurely. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 4ee9c02007249cf9c66e368b5d433c6956e05586 tree b11e5a80e6528e5e810726761347e6d68a34dc83 parent 7c5c220e254b2cdcf7083dcaf445820b899f7e8b author Jeff Kirsher Thu, 12 Jan 2006 16:50:18 -0800 committer Jeff Garzik Tue, 17 Jan 2006 07:40:09 -0500 [PATCH] e1000: Fix jumbo frame performance Partition PBA for Jumbo frames based on MTU size. Signed-off-by: Jeff Kirsher Signed-off-by: Jesse Brandeburg Signed-off-by: John Ronciak Signed-off-by: Jeff Garzik commit 7c5c220e254b2cdcf7083dcaf445820b899f7e8b tree 80a5f7527129299ef29911fde0a1ad87cde63759 parent 11f1a52b87eaf830bd03d4e01d563437c30f7728 author Arnd Bergmann Thu, 12 Jan 2006 17:16:45 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:01 -0500 [PATCH] spidernet: fix missing include This is now required to avoid drivers/net/spider_net.c:844: error: 'IPPROTO_TCP' undeclared Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 11f1a52b87eaf830bd03d4e01d563437c30f7728 tree f251162b093f1ac7153d17de8d046f16f3e2e17e parent 8e0a613bf61ccaab376877d7c2ed50315b8ca6d7 author Arnd Bergmann Thu, 12 Jan 2006 17:16:44 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:01 -0500 [PATCH] spidernet: performance optimizations Performance optimizations, changes in these areas: - RX and TX checksum offload - correct maximum MTU - don't use TX interrupts anymore, use a timer instead - remove some superfluous barriers - improve RX RAM full handling From: Utz Bacher Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 8e0a613bf61ccaab376877d7c2ed50315b8ca6d7 tree 76964e5d482023c895487a7392a3e3e18d7dc599 parent 030d6753f8b6251927330431a7e5f0ac86bc6da9 author Arnd Bergmann Thu, 12 Jan 2006 17:16:43 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:00 -0500 [PATCH] spidernet: fix HW structures for 64 bit dma_addr_t The driver incorrectly used dma_addr_t to describe HW structures and consequently broke when that type was changed in 2.6.15-rc. This changed spidernet to use u32 for 32 bit HW defined structure elements. From: Jens Osterkamp Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 030d6753f8b6251927330431a7e5f0ac86bc6da9 tree 12cab3e13f51b63ced212d2ac909c42ca8c10857 parent 0d3ea1666f1894a874681fe33e2cb7fee41a0c73 author Arnd Bergmann Thu, 12 Jan 2006 17:16:42 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:00 -0500 [PATCH] spidernet: read firmware from the OF device tree request_firmware() is sometimes problematic, especially in initramfs, reading the firmware from Open Firmware is much preferrable. We still try to get the firmware from the file system first, in order to support old SLOF releases and to allow updates of the spidernet firmware without reflashing the system. From: Jens Osterkamp Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 0d3ea1666f1894a874681fe33e2cb7fee41a0c73 tree 6a206ebf46fe622ae6d06923c92b8a737f63ce86 parent c2e5b352fcefb644959a0c8b1bb2e297f0d4ac3d author Arnd Bergmann Thu, 12 Jan 2006 17:16:41 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:25:00 -0500 [PATCH] spidernet: check if firmware was loaded correctly Uploading the device firmware may fail if wrong input data was provided by the user. This checks for the condition. From: Jens Osterkamp Signed-off-by: Jens Osterkamp Signed-off-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit c2e5b352fcefb644959a0c8b1bb2e297f0d4ac3d tree 65972fbb796b4f08e66600faf53e7046fcb0702c parent ab4384a6588925607f734e195f49e34a80f31e84 author Dale Farnsworth Mon, 16 Jan 2006 17:00:24 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:39 -0500 [PATCH] mv643xx_eth: Remove needless mask of extended intr register All interrupts controlled by the extended mask register are also masked by a bit in the main mask register, so there is no need to directly manipulate the extended mask register. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 81 ++++++++++++++++++---------------------------------------- 1 file changed, 26 insertions(+), 55 deletions(-) Signed-off-by: Jeff Garzik commit ab4384a6588925607f734e195f49e34a80f31e84 tree e0fc58cb591c725a4e7a2437099af4eb1febf280 parent 4476e0e4c7e6a2c22288391b853b6e071622f079 author Dale Farnsworth Mon, 16 Jan 2006 16:59:21 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Merge open and stop helper functions Move code from helper functions mv643xx_eth_real_open and mv643xx_eth_real_stop as they are no longer needed. Signed-off-by Dale Farnsworth mv643xx_eth.c | 109 +++++++++++++++++++++++----------------------------------- 1 file changed, 45 insertions(+), 64 deletions(-) Signed-off-by: Jeff Garzik commit 4476e0e4c7e6a2c22288391b853b6e071622f079 tree e51ce4e1b1b50ea539ff179ccff3a4fffceae7bb parent 63890576a3bfd5c6aea86fb72236682480865bc0 author Dale Farnsworth Mon, 16 Jan 2006 16:58:24 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Fix transmit skb accounting Signed-off-by: Dale Farnsworth mv643xx_eth.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Signed-off-by: Jeff Garzik commit 63890576a3bfd5c6aea86fb72236682480865bc0 tree 1d9142884b2d831b7f9b55714baa110457e35710 parent 8f5187035ad475c90ca865318daa09ba43bc3e68 author Wolfram Joost Mon, 16 Jan 2006 16:57:41 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Request HW checksum generation only for IPv4 This patch removes the NETIF_F_HW_CSUM flag to be able to use other protocols than IPv4. Hardware checksums for IPv4 should continue to work because NETIF_F_IP_CSUM is still set. The sanity-check has been enhanced to check the used protocol and to not access skb->iph for non-ipv4-packets. Signed-off-by: Wolfram Joost Signed-off-by: Dale Farnsworth mv643xx_eth.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) Signed-off-by: Jeff Garzik commit 8f5187035ad475c90ca865318daa09ba43bc3e68 tree 43b304d094d8fec20a2589239f56ff31bc4aa8d1 parent dd09b1de08b28ccfb130ca97d617dc3283165d22 author Dale Farnsworth Mon, 16 Jan 2006 16:56:30 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:38 -0500 [PATCH] mv643xx_eth: Hold spinlocks only where needed This driver has historically held a spin_lock during the entire open and stop functions and while receiving multiple packets. This is unecessarily long and holds locks during calls that may sleep. This patch reduces the size of windows where locks are held. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 172 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 91 insertions(+), 81 deletions(-) Signed-off-by: Jeff Garzik commit dd09b1de08b28ccfb130ca97d617dc3283165d22 tree de89ba2464dc96d991e982182d4db6c3ce872c70 parent f7ea333765438232ac346a2f23cfec3e2012758f author Dale Farnsworth Mon, 16 Jan 2006 16:53:15 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: iounmap the correct SRAM buffer Signed-off-by: Dale Farnsworth mv643xx_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit f7ea333765438232ac346a2f23cfec3e2012758f tree 9a1f685e3220e9b6b4170586e7f4b4d19fc6e753 parent b44cd572623cb6a931a947d9108595517fd945f8 author Paul Janzen Mon, 16 Jan 2006 16:52:13 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Fix handling of small, unaligned fragments Fix handling of small, unaligned fragments. It also solves a potential deadlock if skb_linearize() returns -ENOMEM. Signed-off-by: Paul Janzen Signed-off-by: Dale Farnsworth mv643xx_eth.c | 54 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 23 deletions(-) Signed-off-by: Jeff Garzik commit b44cd572623cb6a931a947d9108595517fd945f8 tree fc4a28e35531ad9bc3596b262ad834aff82d4662 parent 16e0301831767ee1b8e5e022cc08e76f9f8a8938 author Dale Farnsworth Mon, 16 Jan 2006 16:51:22 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Receive buffers require 8 byte alignment The Marvell mv643xx ethernet hardware requires that DMA buffers be aligned to 8-byte boundaries. This patch satisfies this requirement. Buffers allocated by dev_alloc_skb() only have 4-byte alignment when slab debugging is enabled. Also, document that the 2-byte offset to align the IP packets on receive is a hardware feature and is not tied to NET_IP_ALIGN. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) Signed-off-by: Jeff Garzik commit 16e0301831767ee1b8e5e022cc08e76f9f8a8938 tree 3562f2195c66c8486b83b960e20e67b62054e01e parent 4eaa3cb35b22cccc53846ce2820e244b1fb04f0b author Dale Farnsworth Mon, 16 Jan 2006 16:50:02 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Add multicast support This code is adapted from code in a ppc-specific version of the driver. Signed-off-by: Dale Farnsworth mv643xx_eth.c | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 197 insertions(+), 4 deletions(-) Signed-off-by: Jeff Garzik commit 4eaa3cb35b22cccc53846ce2820e244b1fb04f0b tree 65aa1145fbf4eed0700ced76dd9a6e9b6a3dfbb2 parent cb415d30048f0c1f80fd2f5340a982e8c9617d0d author Paolo Galtieri Mon, 16 Jan 2006 16:48:58 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:37 -0500 [PATCH] mv643xx_eth: Fix a NULL pointer dereference Fix a NULL pointer dereference. Fill in the buf_ptr and byte_cnt fields of pkt_info in eth_tx_return_desc(). Signed-off-by: Paolo Galtieri Signed-off-by: Dale Farnsworth mv643xx_eth.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) Signed-off-by: Jeff Garzik commit cb415d30048f0c1f80fd2f5340a982e8c9617d0d tree 652413a7b26def01c70e1c5296822b0258c54475 parent 78a5e534758349fd3effc90ce1152b55368f52ee author Paolo Galtieri Mon, 16 Jan 2006 16:48:02 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:36 -0500 [PATCH] mv643xx_eth: Fix dma_map/dma_unmap relations If you do a dma_map_single you must do dma_unmap_single and if you do a dma_map_page you must do a dma_unmap_page. Signed-off-by: Paolo Galtieri Signed-off-by: Dale Farnsworth mv643xx_eth.c | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) Signed-off-by: Jeff Garzik commit 78a5e534758349fd3effc90ce1152b55368f52ee tree 7aab67ad32e58e8f87eb69a93e17958a2e6c7774 parent b60d6975e80ac69e4b797173857eeb5362e265a2 author Olaf Hering Mon, 16 Jan 2006 16:47:00 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:36 -0500 [PATCH] mv643xx_eth: 2.6.16 needs ip.h and in.h Signed-off-by: Olaf Hering Signed-off-by: Dale Farnsworth mv643xx_eth.c | 2 ++ 1 file changed, 2 insertions(+) Signed-off-by: Jeff Garzik commit b60d6975e80ac69e4b797173857eeb5362e265a2 tree cde2a625c95c05e7d9734db4de2933218b45ffbf parent 0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9 author Dale Farnsworth Mon, 16 Jan 2006 16:45:45 -0700 committer Jeff Garzik Tue, 17 Jan 2006 07:23:36 -0500 [PATCH] mv643xx_eth: Add Dale Farnsworth as a maintainer MAINTAINERS | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9 tree 4135d9bb556c42359a955e72eb20ff745d9b58bf parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 parent 5fad5a2e1f34b333a801b749c4e143c2ac3e8a4f author Jeff Garzik Tue, 17 Jan 2006 07:22:26 -0500 committer Jeff Garzik Tue, 17 Jan 2006 07:22:26 -0500 Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6 commit 2f970d83576cf4938fd75551c465050f6a16c33c tree 7bb43aabfbd8afdab49549e4d56c0a15015d5995 parent 8243126c5e29030bf1a3fb75187a513966dcba62 author Eric Dumazet Tue, 17 Jan 2006 02:54:36 -0800 committer David S. Miller Tue, 17 Jan 2006 02:54:36 -0800 [IPV4]: rt_cache_stat can be statically defined Using __get_cpu_var(obj) is slightly faster than per_cpu_ptr(obj, raw_smp_processor_id()). 1) Smaller code and memory use For static and small objects, DEFINE_PER_CPU(type, object) is preferred over a alloc_percpu() : Better and smaller code to access them, and no extra memory (storing the pointer, and the percpu array of pointers) x86_64 code before patch mov 1237577(%rip),%rax # ffffffff803e5990 not %rax # part of per_cpu machinery mov %gs:0x3c,%edx # get cpu number movslq %edx,%rdx # extend 32 bits cpu number to 64 bits mov (%rax,%rdx,8),%rax # get the pointer for this cpu incl 0x38(%rax) x86_64 code after patch mov $per_cpu__rt_cache_stat,%rdx mov %gs:0x48,%rax # get percpu data offset incl 0x38(%rax,%rdx,1) 2) False sharing avoidance for SMP : For a small NR_CPUS, the array of per cpu pointers allocated in alloc_percpu() can be <= 32 bytes. This let slab code gives a part of a cache line. If the other part of this 64 bytes (or 128 bytes) cache line is used by a mostly written object, we can have false sharing and expensive per_cpu_ptr() operations. Size of rt_cache_stat is 64 bytes, so this patch is not a danger of a too big increase of bss (in UP mode) or static per_cpu data for SMP (PERCPU_ENOUGH_ROOM is currently 32768 bytes) Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8243126c5e29030bf1a3fb75187a513966dcba62 tree 39750d44770efcdac150f041f71b7272c8da20f9 parent f09484ff87f677056ce631aa3d8e486861501b51 author David S. Miller Tue, 17 Jan 2006 02:54:21 -0800 committer David S. Miller Tue, 17 Jan 2006 02:54:21 -0800 [NET]: Make second arg to skb_reserved() signed. Some subsystems, such as PPP, can send negative values here. It just happened to work correctly on 32-bit with an unsigned value, but on 64-bit this explodes. Figured out by Paul Mackerras based upon several PPP crash reports. Signed-off-by: David S. Miller commit f09484ff87f677056ce631aa3d8e486861501b51 tree 9c9d208a5e4f2d359087e3e9b00d7b00b4a2ec93 parent ec41c7dfd525468decb9da9281dbc9ed82d98c98 author David S. Miller Tue, 17 Jan 2006 02:42:02 -0800 committer David S. Miller Tue, 17 Jan 2006 02:42:02 -0800 [NETFILTER]: ip_conntrack_proto_gre.c needs linux/interrupt.h Signed-off-by: David S. Miller commit ec41c7dfd525468decb9da9281dbc9ed82d98c98 tree 02ac7f0b1318c69d53a2405972f8a6880dc8b7c6 parent f0daaa654af68c1651add9d21188d81c19672551 author Michael Chan Tue, 17 Jan 2006 02:40:55 -0800 committer David S. Miller Tue, 17 Jan 2006 02:40:55 -0800 [TG3]: Refine nvram locking Add nvram lock count so that calls to tg3_nvram_lock()/unlock() can be nested. Add error checking to all callers of tg3_nvram_lock() where appropriate. To prevent nvram lock failures after halting the firmware, it is also necessary to release firmware's nvram lock in tg3_halt_cpu(). Update version to 3.48. Based on David Miller's initial patch. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit f0daaa654af68c1651add9d21188d81c19672551 tree 50eebd2b494c15498c96a82bdaf5315b39b0e0fa parent e0069caede8387c585060b7e2e87729e9efcebc6 author Yasuyuki Kozakai Tue, 17 Jan 2006 02:39:39 -0800 committer David S. Miller Tue, 17 Jan 2006 02:39:39 -0800 [NETFILTER] ip6tables: whitespace and indent cosmetic cleanup Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit e0069caede8387c585060b7e2e87729e9efcebc6 tree dec3b2bd98aa2081519a370569c70640592c0909 parent 6dd42af7904336c6f59a01f9fd3599ee650e78ed author Yasuyuki Kozakai Tue, 17 Jan 2006 02:39:19 -0800 committer David S. Miller Tue, 17 Jan 2006 02:39:19 -0800 [NETFILTER] ip6tables: remove unused definitions These definitions ware used for only internal use in kernel <= 2.6.13, which had not introduced the unified parser of IPv6 extension header yet. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 6dd42af7904336c6f59a01f9fd3599ee650e78ed tree b8688c0fc87a67352a26f4772f02c2232a7bafc5 parent ccc91324a1b44d345ab4f814eb2ff453c7e98f9e author Yasuyuki Kozakai Tue, 17 Jan 2006 02:38:56 -0800 committer David S. Miller Tue, 17 Jan 2006 02:38:56 -0800 [NETFILTER] Makefile cleanup These are replaced with x_tables matches and no longer exist. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit ccc91324a1b44d345ab4f814eb2ff453c7e98f9e tree 24ac07d2a014a5f6b8dcc685fb76afea1048485d parent e35bedf369b17120dbd7d554bee45407a3825267 author Benoit Boissinot Tue, 17 Jan 2006 02:26:34 -0800 committer David S. Miller Tue, 17 Jan 2006 02:26:34 -0800 [NETFILTER] ip[6]t_policy: Fix compilation warnings ip[6]t_policy argument conversion slipped when merging with x_tables Signed-off-by: Benoit Boissinot Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit e35bedf369b17120dbd7d554bee45407a3825267 tree 5ac5aa1c71c0e2d349a13b9103147c0346129326 parent dd914b4082cfbe28849898a0a98757827829c813 author Kris Katterjohn Tue, 17 Jan 2006 02:25:52 -0800 committer David S. Miller Tue, 17 Jan 2006 02:25:52 -0800 [NET]: Fix whitespace issues in net/core/filter.c This fixes some whitespace issues in net/core/filter.c Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit dd914b4082cfbe28849898a0a98757827829c813 tree b1a022975ab230e9496fdcddbb057f0b0b0d7e41 parent 9343e79a7bb2d3268d68997163608b87d58d8098 author Amnon Aaronsohn Tue, 17 Jan 2006 02:24:26 -0800 committer David S. Miller Tue, 17 Jan 2006 02:24:26 -0800 [PKT_SCHED] sch_prio: fix qdisc bands init Currently when PRIO is configured to use N bands, it lets the packets be directed to any of the bands 0..N-1. However, PRIO attaches a fifo qdisc only to the bands that appear in the priomap; the rest of the N bands remain with a noop qdisc attached. This patch changes PRIO's behavior so that it attaches a fifo qdisc to all of the N bands. Signed-off-by: Amnon Aaronsohn Signed-off-by: David S. Miller commit 9343e79a7bb2d3268d68997163608b87d58d8098 tree 1016bc38ce877e988e26ec644a48e73cc1c1545d parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 author YOSHIFUJI Hideaki Tue, 17 Jan 2006 02:10:53 -0800 committer David S. Miller Tue, 17 Jan 2006 02:10:53 -0800 [IPV6]: Preserve procfs IPV6 address output format Procfs always output IPV6 addresses without the colon characters, and we cannot change that. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 5fad5a2e1f34b333a801b749c4e143c2ac3e8a4f tree 6f54bc291ad4ea7b5e892ea1ebbb3f3fec48616e parent 8aec938389d8409d5d036131c0d16c8b6748703f author Adrian Bunk Sat, 14 Jan 2006 03:09:34 +0100 committer John W. Linville Mon, 16 Jan 2006 16:51:54 -0500 [PATCH] hostap: don't #include C files in hostap_main.c This patch contains an attempt to properly build hostap.o without #include'ing C files. Signed-off-by: Adrian Bunk Signed-off-by: John W. Linville commit 8aec938389d8409d5d036131c0d16c8b6748703f tree 246dcce1c4d889fd5784f1e8e758b7213a76262e parent d6a13a24b76236ade7fd70081ba41a51e8215578 author Adrian Bunk Sat, 14 Jan 2006 16:20:53 +0100 committer John W. Linville Mon, 16 Jan 2006 16:51:54 -0500 [PATCH] ipw2100: remove code for WIRELESS_EXT < 18 WIRELESS_EXT < 18 will never be true in the kernel. Signed-off-by: Adrian Bunk Signed-off-by: John W. Linville commit d6a13a24b76236ade7fd70081ba41a51e8215578 tree 85c495d422a6e152789108b8623245886afcd554 parent a485cde662f5b6b2299ee01a7e9e2c11683f807b author Dan Williams Thu, 12 Jan 2006 15:00:58 -0500 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] drivers/net/wireless: correct reported ssid lengths ESSIDs can technically include NULL characters. Drivers should not be adjusting the length of the ESSID before reporting it in their SIOCGIWESSID handlers. Breaks stuff like wpa_supplicant. Note that ipw drivers, which seem to currently be the "most correct", don't have this problem. Signed-off-by: Dan Williams Signed-off-by: John W. Linville commit a485cde662f5b6b2299ee01a7e9e2c11683f807b tree 359f04714e13c7010fa0f63d6968211d658c3af7 parent d834a41c966c6a20368fadb59248740935e6fbae author Pavel Roskin Fri, 30 Dec 2005 18:22:26 -0500 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] hostap: allow flashing firmware Host AP driver has code to support writing firmware to non-volatile memory, a.k.a. flash. This code has been extensively tested when Host AP was a standalone driver. Add a configuration option to the kernel to allow enabling this functionality. Improve the description of the RAM download option. Mention cards that require it. Remove obsolete scary comment. Signed-off-by: Pavel Roskin Signed-off-by: John W. Linville commit d834a41c966c6a20368fadb59248740935e6fbae tree 53163530c274c0f9b7eeed35e0fd9564f48a7192 parent 0b8d3256a0c1d75bbe8ef5b0de64843e3fc9f47b author Olaf Kirch Mon, 09 Jan 2006 17:00:37 +0100 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] ipw2200: do not sleep in ipw_request_direct_scan Drivers should not sleep for very long inside an ioctl - so return EAGAIN and let wpa_supplicant handle the problem. Signed-off-by: Olaf Kirch Signed-off-by: John W. Linville commit 0b8d3256a0c1d75bbe8ef5b0de64843e3fc9f47b tree 2bb5a1943f7b3a7898b92b68e17d03648feb31b9 parent caa06b619f20f21c741e0d7457a0ef633d50ba70 author Pete Zaitcev Thu, 12 Jan 2006 22:17:43 -0800 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] iw_handler.h: SIOCSIWNAME -> SIOCSIWCOMMIT in comment The ioctl was renamed from SIOCSIWNAME to SIOCSIWCOMMIT. Signed-off-by: Pete Zaitcev Signed-off-by: John W. Linville commit caa06b619f20f21c741e0d7457a0ef633d50ba70 tree 7763fee18e161586d292de72e95ac23a3623df0e parent 4a8e4a270b89030bdeb09d2f8cef7cfe9a50e54d author Graham Gower Mon, 16 Jan 2006 16:41:37 -0500 committer John W. Linville Mon, 16 Jan 2006 16:51:53 -0500 [PATCH] prism54/islpci_eth.c: dev_kfree_skb used with interrupts disabled dev_kfree_skb should not be used with interrupts disabled. Change to use dev_kfree_skb_irq instead. Signed-off-by: Graham Gower Signed-off-by: John W. Linville