summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of ↵Linus Torvalds2007-02-1957-447/+706
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (51 commits) sk98lin: mark deprecated in Kconfig Hostess SV-11 depends on INET Fix link autonegotiation timer. sk98lin: planned removal B44: increase wait loop b44: replace define e1000: allow ethtool to see link status when down e1000: remove obsolete custom pci_save_state code e1000: fix shared interrupt warning message atm: Use ARRAY_SIZE macro when appropriate bugfixes and new hardware support for arcnet driver pcnet32 NAPI no longer experimental MAINTAINER macb: Remove inappropriate spinlocks around mii calls Convert meth to netdev_priv sky2: v1.13 sky2: receive error handling improvements sky2: transmit timeout sky2: flow control negotiation for Yukon-FE sky2: no need to reset pause bits on shutdown ...
| * sk98lin: mark deprecated in KconfigDaniel Drake2007-02-171-3/+5
| | | | | | | | | | | | | | | | | | sk98lin is scheduled for removal in July 2007. This patch makes the deprecation more obvious in the configuration interface. FWIW, Gentoo have been shipping a patch very similar to this for a long time. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Hostess SV-11 depends on INETBaruch Even2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Comtrol Hostess SV-11 driver uses features from INET but doesn't depend on it. The simple solution is to make it depend on INET as happens for the sealevel driver. Fixes bug #7930. Signed-Off-By: Baruch Even <baruch@ev-en.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Fix link autonegotiation timer.Ralf Baechle2007-02-171-3/+13
| | | | | | | | | | | | | | | | | | Start link negotiation in the open method. Previously it was started on driver initialialization and shutdown on close so an ifdown would have results in closing negotiation for good. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sk98lin: planned removalStephen Hemminger2007-02-171-0/+3
| | | | | | | | | | | | | | Nag message about planned sk98lin removal. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * B44: increase wait loopGary Zambrano2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The b44 Enet control disable bit may take longer to clear on some systems, so the loop count is increased with this patch. Functionality is not compromised, but a debug message can be seen when the bit is not cleared within the count value. Thanks to Vasileios Lourdas who reported the problem. Signed-off by: Gary Zambrano <zambrano@broadcom.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * b44: replace defineGary Zambrano2007-02-171-9/+8
| | | | | | | | | | | | | | | | Replaced B44_DMA_MASK with DMA_30BIT_MASK. Signed-off by: Gary Zambrano <zambrano@broadcom.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * e1000: allow ethtool to see link status when downKok, Auke2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | By reading the MAC status register we can detect whether the MAC has seen the PHY see link. This allows us to show the link properties before the device is up in ethtool. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * e1000: remove obsolete custom pci_save_state codeKok, Auke2007-02-172-57/+2
| | | | | | | | | | | | | | | | | | Now that 2.6.19 provides a proper implementation that saves MSI, PCI-E config space, we can have the e1000 driver use those instead of it's custom implementation. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * e1000: fix shared interrupt warning messageKok, Auke2007-02-171-6/+6
| | | | | | | | | | | | | | Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atm: Use ARRAY_SIZE macro when appropriateAhmed S. Darwish2007-02-173-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | Use ARRAY_SIZE macro already defined in kernel.h for ATM drivers. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Cc: Jeff Garzik <jeff@garzik.org> Cc: chas williams <chas@cmf.nrl.navy.mil> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * bugfixes and new hardware support for arcnet driverJeff Morrow2007-02-174-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The modifications and bug fixes noted below were done by Realtime Control Works and Contemporary Control Systems, Inc, Jan 2005. They were incorporated into the 2.6 kernel by Jeff Morrow of Sierra Analytics, Feb 2007. <jmorrow@massspec.com> The changes have been tested on a Contemporary Controls PCI20U-4000. Summary of changes: Arc-rawmode.c: rx(): - Fixed error in received packet lengths; 256 byte packets were being received as 257 bytes packets. prepare_tx(): - Fixed error in transmit length calcs; 257 byte packets were being transmitted as 260 byte packets. com20020.c: com20020_check(): - We now load the SETUP2 register if the 'clockm' parameter is non-zero, instead of checking for ARC_CAN_10MBIT. The user is now responsible for whether or not SETUP2 is loaded. If the clock multiplier is non-zero, this means that the user wants a baud rate greater than 2.5Mbps. This is not possible unless the SETUP2 register is present (COM20020D, or COM20022). So, we're relying on the user to be smart about what kind of chip he's dealing with... com20020-pci.c - Added several entries to com20020pci_id_table[]. Signed-off-by: Jeff Morrow <jmorrow@massspec.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * pcnet32 NAPI no longer experimentalpcnet32@verizon.net2007-02-171-2/+2
| | | | | | | | | | | | | | Remove the experimental tag for the pcnet32 NAPI implementation. Signed-off-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * MAINTAINERpcnet32@verizon.net2007-02-171-2/+2
| | | | | | | | | | | | | | After being the defacto maintainer for a couple of years, I can now become the official maintainer. Signed-off-by: Don Fry <pcnet32@verizon.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * macb: Remove inappropriate spinlocks around mii callsHaavard Skinnemoen2007-02-171-21/+3
| | | | | | | | | | | | | | | | | | | | | | Remove spin_lock_irqsave() around mii_ethtool_gset, mii_ethtool_sset and generic_mii_ioctl. These are unnecessary and harmful because the mii calls may call back into the mdio functions, which may sleep. Pointed out by David Brownell. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Convert meth to netdev_privRalf Baechle2007-02-171-13/+13
| | | | | | | | | | | | | | And while at it loose plenty of useless casts. Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: v1.13Stephen Hemminger2007-02-171-1/+1
| | | | | | | | | | | | | | New version. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: receive error handling improvementsStephen Hemminger2007-02-171-8/+1
| | | | | | | | | | | | | | | | | | Don't drop oversize frame it might be a VLAN (untagged). Use different counter for fifo overrun vs fifo error. Print error on fifo overrrun. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: transmit timeoutStephen Hemminger2007-02-172-16/+50
| | | | | | | | | | | | | | | | | | The transmit timeout code could hang, and it would not clear out problems if the hardware was stuck. Change the code to effectively do a device down/up similar to the suspend/resume code. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: flow control negotiation for Yukon-FEStephen Hemminger2007-02-171-11/+31
| | | | | | | | | | | | | | | | | | | | | | The Yukon-FE chip doesn't do gigabit and has a differen PHY internally. On this chip, phy status register doesn't properly reflect the result of flow control negotiation. To workaround the problem and avoid having to have so much chip dependent code; compute the result of flow control by looking at the local and remote advertised bits. Signed-off-by: Stephen Hemmminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: no need to reset pause bits on shutdownStephen Hemminger2007-02-171-7/+0
| | | | | | | | | | | | | | | | | | Resetting the pause bits on shutdown is not necessary. The code was inherited from the vendor driver, and it is currently #ifdef'd out there as well. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * sky2: dont flush good pause framesStephen Hemminger2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | Don't mark pause frames as errors. This problem caused transmitter not to pause and would effectively take out a gigabit switch because the it can't handle overrun. Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * cxgb3 Fix copyrights in the cxgb3 driver.Steve Wise2007-02-176-6/+0
| | | | | | | | | | | | | | | | | | Fix copyrights in the cxgb3 driver. Remove the Open Grid Computing copyright. It shouldn't be there. Signed-off-by: Steve Wise <swise@opengridcomputing.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * gianfar: don't duplicate gfar_error()Sergei Shtylyov2007-02-171-70/+15
| | | | | | | | | | | | | | | | | | | | | | It was hardly necessary to repeat most of the code from gfar_error() in gfar_interrupt(), especially having some inconsistencies between the two. So, make the gfar_interrupt() just call gfar_error(), and not acknowledge the interrupts itself as gfar_{receive/transmit/error}() do it anyway. While at it, also clarify/cleanup debug messages in gfar_error()... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * NetXen: Fix to get the driver working after sparse changesAmit S. Kale2007-02-171-4/+4
| | | | | | | | | | Signed-off-by: Amit S. Kale <amitkale@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * net/wan/pc300too.c: pci_module_init to pci_register_driverRichard Knutsson2007-02-171-1/+1
| | | | | | | | | | | | | | Convert pci_module_init() to pci_register_driver(). Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: bump version numberJay Cliburn2007-02-171-1/+1
| | | | | | | | | | | | | | Bump the version number. Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: add L1 device id to pci_ids, then use itChris Snook2007-02-172-1/+2
| | | | | | | | | | | | | | | | Add device id for the Attansic L1 chip to pci_ids.h, then use it. Signed-off-by: Chris Snook <csnook@redhat.com> Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: remove unused defineChris Snook2007-02-171-1/+0
| | | | | | | | | | | | | | | | Remove unused define from atl1_main.c. Signed-off-by: Chris Snook <csnook@redhat.com> Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: read MAC address from registerJay Cliburn2007-02-171-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Asus motherboards containing the L1 NIC, the MAC address is written by the BIOS directly to the MAC register during POST, and is not stored in eeprom. If we don't succeed in fetching the MAC address from eeprom or spi, try reading it directly from the MAC register. Suggested by Xiong Huang. And do some cleanup while we've got the hood up... Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Chris Snook <csnook@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: fix bad ioread addressAl Viro2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | An ioread32 statement reads the wrong address. Fix it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Chris Snook <csnook@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * atl1: drop NET_PCI from KconfigJay Cliburn2007-02-171-1/+1
| | | | | | | | | | | | | | | | | | The atl1 driver doesn't need NET_PCI. Remove it from Kconfig. Noticed by Chad Sprouse. Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Chris Snook <csnook@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * PCMCIA-NETDEV : the 2nd argument of el3_interrrupt and smc_interrupt is ↵Komuro2007-02-172-2/+2
| | | | | | | | | | | | | | struct net_device* Signed-off-by: Komuro <komurojun-mbn@nifty.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * phylib: Add support for Marvell 88e1111S and 88e1145Andy Fleming2007-02-171-12/+144
| | | | | | | | | | | | | | | | | | | | | | | | Changes include: * New support for 88e1145 * New support for 88e111s * Fixing 88e1101 driver to not match non-88e1101 PHYs * Increases in feature support across Marvell PHY product line * Fixes a bunch of whitespace issues found by Lindent Signed-off-by: Andrew Fleming <afleming@freescale.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * Merge branch 'master' into upstreamJeff Garzik2007-02-171487-15546/+43459
| |\
| * \ Merge branch 'gfar' of ↵Jeff Garzik2007-02-172243-41436/+57341
| |\ \ | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
| | * | Convert network devices to use struct device instead of class_deviceKumar Gala2007-02-131-53/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert network devices to use struct device instead of class_device. Greg missed this one in his cleanup path. Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| * | | phy devices: use same arg typesRandy Dunlap2007-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sparse complains about differing types from prototype to definition, so change the u32 to phy_interface_t: drivers/net/phy/phy_device.c:140:19: error: symbol 'phy_connect' redeclared with different type (originally declared at include/linux/phy.h:362) - incompatible argument 5 (different signedness) drivers/net/phy/phy_device.c:190:19: error: symbol 'phy_attach' redeclared with different type (originally declared at include/linux/phy.h:360) - incompatible argument 4 (different signedness) Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | | Merge branch 'upstream' of ↵Jeff Garzik2007-02-099-94/+210
| |\ \ \ | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
| | * | | [PATCH] ieee80211: Fix sparse warningLarry Finger2007-02-091-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sparse issues the warning "warning: symbol 'crypt' shadows an earlier one" in net/ieee80211/ieee80211_tx.c. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] bcm43xx: Check error returns in initialization routinesLarry Finger2007-02-091-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A number of the calls in the initialization routines fail to check the returned value for errors. This patch adds the necessary checks and logs any errors found when appropriate. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] Replace incorrect macro name "WIRELESS_EXT" with "CONFIG_WIRELESS_EXT"Robert P. J. Day2007-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the (apparently) incorrect macro name WIRELESS_EXT to CONFIG_WIRELESS_EXT. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] Rename IPW2100 debugging macros to not look like config options.Robert P. J. Day2007-02-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename some internal ipw2100 debugging macros to not look like user-settable kernel config settings. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] zd1211rw: Remove noisy debug messageDaniel Drake2007-02-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This causes a lot of uninteresting output in noisy environments, and doesn't really serve any purpose. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] zd1211rw: Added error stats updateUlrich Kunitz2007-02-072-5/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added update of network device error statistics. Based on earlier work by Maxime Austruy. Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] zd1211rw: Fixed array size issue in reset_modeUlrich Kunitz2007-02-071-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Andy Green found this issue. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] zd1211rw: Reset device in the probe callUlrich Kunitz2007-02-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resets the device in the probe call. It does work with 2.6.19.2 including the softmac patches. It might fix the reboot/reset problems a lot of people reported. Signed-off-by: Ulrich Kunitz <kune@deine-taler.de> Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] bcm43xx: Enable fwpostfix in nondebug bcm43xxMichael Buesch2007-02-071-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The in-kernel bcm43xx driver only works with V3 firmware, whereas the experimental version that incorporates the d80211 stack requires V4 firmware. In bcm43xx-d80211, the fwpostfix module parameter is used to differentiate between the versions. In bcm43xx-softmac, this module parameter is only enabled when debugging is on. This patch makes the module parameter available unconditionaly, and should ease the future transition from softmac to d80211. Signed-off-by: Michael Buesch <mb@bu3sch.de> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] bcm43xx: Fix scaling error for 'iwlist freq' informationLarry Finger2007-02-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bcm43xx driver returns the available frequencies to 'iwlist freq' with the wrong scaling. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | | [PATCH] bcm43xx: Fix scaling error for 'iwlist rate' informationLarry Finger2007-02-071-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bcm43xx scales the rate information supplied to a WE iwlist rate call incorrectly. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 18:49:53 +0100