aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PATCH] enp2611: use 'dev' in link status timerLennert Buytenhek2005-12-01
| | | | | | | | We assign nds[i] to a local variable 'dev', which we never use afterwards. Use the local variable instead. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] enp2611: don't check netif_running() in link status timerLennert Buytenhek2005-12-01
| | | | | | | | Even after an interface has gone !netif_running(), we still want to catch the 'carrier went down' event for our internal bookkeeping. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] ixp2000: use netif_rx_schedule_testLennert Buytenhek2005-12-01
| | | | | | | | | | The sky2 driver introduced netif_rx_schedule_test(). This is exactly what we need, so remove our local version of this function (which was called netif_rx_schedule_prep_notup) and use the generic one instead. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] caleb/pm3386: include proper header filesLennert Buytenhek2005-12-01
| | | | | | | | Make caleb.c and pm3386.c include their own header files, to catch incorrect prototype definitions. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] pm3386: remove unnecessary udelaysLennert Buytenhek2005-12-01
| | | | | | | Remove a number of unnecessary udelay() calls. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] pm3386: zero stats properlyLennert Buytenhek2005-12-01
| | | | | | | Zero our stats structure properly. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] ixp2000: register netdevices lastLennert Buytenhek2005-12-01
| | | | | | | | Do not register our netdevices with the kernel until we've actually finished setting up the hardware and microcode. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] sk98lin: remove /proc interfaceshemminger@osdl.org2005-12-01
| | | | | | | | Remove device specific proc interface. It doesn't handle renames correctly; it ain't worth fixing. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] sk98lin: remove redundant fields in device infoshemminger@osdl.org2005-12-01
| | | | | | | | Shrink size of per device data by removing redundant fields or things that are only used at boot up. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* [PATCH] sk98lin: allow ethtool checksum on/off per portshemminger@osdl.org2005-12-01
| | | | | | | Allow control of checksumming parameters via ethtool. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* Merge branch 'upstream-fixes'Jeff Garzik2005-12-01
|\
| * [PATCH] sk98lin: avoid message confusion with skgeshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | Avoid possible confusion between skge and sk98lin driver by tagging messages properly. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] sk98lin: add permanent address supportshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | Add permanent address and link status support via ethtool. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] sk98lin: fix checksumming codeshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | Remove code from sk98lin that does it's own checksum validation. This code is incorrect when dealing with nested protocols like VLAN's, and it is better to use regular receive code path to handle hardware checksum. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] e1000: fix for dhcp issueJesse Brandeburg2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Parse outgoing packets in e1000_transfer_dhcp_info as raw packet even if protocol bits are set. pump, for instance causes kernel panic on some systems, if parsed via udp header. Thanks to Derrell Lipman <Derrell.Lipman@BacklotTech.com> for reporting and testing. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * Merge branch 'for-jeff' of ↵Jeff Garzik2005-12-01
| |\ | | | | | | | | | git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
| | * b44: increase version numberFrancois Romieu2005-11-30
| | | | | | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | * b44: early return in dev->do_ioctl when the device is not upFrancois Romieu2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | The device has not gone through a whole reset/init sequence until the device is up. Accessing the mii interface before this point is not safe. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| | * b44: missing netif_wake_queue() in b44_open()Mark Lord2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes a problem plaguing Dell notebooks with built-in b44 ethernet: The driver refuses to transmit packets of any kind until after the first 5-second tx_timeout occurs. This bug causes DHCP negotiation to fail (timeout) during installation of Ubuntu Linux. Signed-off-by: Mark Lord <lkml@rtr.ca> Signed-off-by: Andrew Morton <akpm@osdl.org>
* | | [PATCH] sky2: update version numbershemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | Update version number and print version in boot message. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: use pci_register_drivershemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | Switch to using pci_register_driver as per current convention. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: remove pci-express hacksshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | Eliminate special case tuning for PCI-Express. This code causes receive hangs and doesn't help performance much anyway. Signed-off-by: Stephen Hemminger <shemmnger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: byteorder annotationshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | Use byteorder annotation for hardware structures Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: dual port tx completionshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes on dual port cards, one tx complete may cover both ports. To handle that rearrange poll routine to lookup at end. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: race with MTU changeshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | Avoid possible race conditions when doing MTU and change and shutdown. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: change netif_rx_schedule_test to __netif_schedule_prepshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | I didn't like the name netif_rx_schedule_test(), in earlier patches and changed to __netif_rx_schedule_prep to be more consistent. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: handle DMA boundary crossingshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | Handle the case of DMA spanning 32 bit boundary. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: add Yukon-EC ultra supportshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | Add support for Yukon-EC Ultra chip as implemented in SysKonnect's driver version 8.26. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: improve receive performanceshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to receive side processing: * bigger receive ring * clean up polling loop Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: fix receive flush/pause issuesshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | Fix issues with pause and flush. This code works on all chip versions tested. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: add MII supportshemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | Add MII ioctl interface to sky2. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | [PATCH] sky2: eliminate special case for EC-A1shemminger@osdl.org2005-12-01
| | | | | | | | | | | | | | | | | | | | | | | | Eliminate special case for EC-A1. The overhead isn't so great that having config option is worth it. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | | Merge branch 'master'Jeff Garzik2005-12-01
|\| |
| * | Linux v2.6.15-rc4v2.6.15-rc4Linus Torvalds2005-12-01
| | |
| * | Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.gitSteve French2005-11-30
| |\|
| | * Revert "[PATCH] pci_ids.h: remove duplicate entries"Linus Torvalds2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9d6073fb3cda856132dd544d537679f9715436c. It was totally bogus. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * VM: add "vm_insert_page()" functionLinus Torvalds2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is what a lot of drivers will actually want to use to insert individual pages into a user VMA. It doesn't have the old PageReserved restrictions of remap_pfn_range(), and it doesn't complain about partial remappings. The page you insert needs to be a nice clean kernel allocation, so you can't insert arbitrary page mappings with this, but that's not what people want. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6Linus Torvalds2005-11-30
| | |\
| | | * [PATCH] USB: ehci fixupsDavid Brownell2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the EHCI "reset" routine so it better matches what it does (setup); and move the one-time data structure setup earlier, before doing anything that implicitly relies on it having been completed already. From: David Brownell <david-b@pacbell.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | | * [PATCH] USB: Fix USB suspend/resume crasher (#2)Benjamin Herrenschmidt2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch closes the IRQ race and makes various other OHCI & EHCI code path safer vs. suspend/resume. I've been able to (finally !) successfully suspend and resume various Mac models, with or without USB mouse plugged, or plugging while asleep, or unplugging while asleep etc... all without a crash. Alan, please verify the UHCI bit I did, I only verified that it builds. It's very simple so I wouldn't expect any issue there. If you aren't confident, then just drop the hunks that change uhci-hcd.c I also made the patch a little bit more "safer" by making sure the store to the interrupt register that disables interrupts is not posted before I set the flag and drop the spinlock. Without this patch, you cannot reliably sleep/wakeup any recent Mac, and I suspect PCs have some more sneaky issues too (they don't frankly crash with machine checks because x86 tend to silently swallow PCI errors but that won't last afaik, at least PCI Express will blow up in those situations, but the USB code may still misbehave). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | | * [PATCH] Additional device ID for Conexant AccessRunner USB driverDave Jones2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reported as working in Fedora bugzilla by Petr. From: Petr Tuma <petr.tuma@mff.cuni.cz> Signed-off-by: Dave Jones <davej@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | | * [PATCH] USB: documentation updateAlan Stern2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch (as611) fixes a minor mistake and misspelling in the USB documentation. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | | * [PATCH] pci_ids.h: remove duplicate entriesGrant Coady2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | G'day Albert, Andrew, commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 Author: Albert Lee <albertcc@tw.ibm.com> Date: Thu May 12 15:49:21 2005 -0400 duplicates symbols already appearing in pci_ids.h, appended patch removes them again :o) From: Grant Coady <gcoady@gmail.com> pci_ids: commit 4fb80634d30f5e639a92b78c8f215f96a61ba8c7 duplicated a couple existing symbols in pci_ids.h, remove them. Signed-off-by: Grant Coady <gcoady@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | | * [PATCH] hwmon: w83792d fix unused fan pinsJean Delvare2005-11-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. This patch add check for fan4,5,6,7 and do not create device file if their pins are not configured as fan. 2. Fix the issue that can not set fan divisor to 128. 3. Fix the index out of bounds bug in w83792d_detect function. Signed-off-by: Yuan Mu <ymu@winbond.com.tw> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * | [PATCH] SiS DRM: Fix possible NULL dereferenceEgbert Eich2005-11-30
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a NULL pointer reference in DRM. The SiS driver tries to allocate a big chunk of memory, but the return value is never checked. Reported in Novell bugzilla #132271: https://bugzilla.novell.com/show_bug.cgi?id=132271 Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [CIFS] For previous fix, mode on mkdir needed S_IFDIR left out.Steve French2005-11-30
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Missing parenthesis and typo in previous fixSteve French2005-11-30
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.gitSteve French2005-11-29
| |\|
| | * Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2005-11-29
| | |\
| | | * [PATCH] powerpc: prevent stack corruption in call_prom_retOlaf Hering2005-11-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the correct pointer to clear the memory of the return values, to prevent stack corruption in the callers stackframe. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>