summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream' into upstream-jgarzikJohn W. Linville2007-02-1718-185/+157
|\ | | | | | | | | | | | | Conflicts: net/ieee80211/softmac/ieee80211softmac_module.c net/ieee80211/softmac/ieee80211softmac_wx.c
| * [PATCH] ieee80211softmac: Fix setting of initial transmit ratesLarry Finger2007-02-142-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in ieee80211softmac that always sets the user rate to 11Mbs, no matter the capabilities of the device. This bug was probably beneficial as long as the bcm43xx cards were rate limited; however, most are now capable of relatively high speeds. This patch fixes that bug and eliminates an assert that is no longer needed. Once the cards are capable of full OFDM speeds, the 24 Mbs rate will be changed to 54 Mbs. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: OFDM fix for rev 1 cardsLarry Finger2007-02-143-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | Nearly all of the writes to the bcm43xx internal lookup tables (ilt) involve 16-bit quantities. Accordingly, the ilt_write routine was coded to pass a u16 value. For one early GPHY chip, 32-bit quantities are needed. For those writes, the value was clipped to 16 bits. This patch adds an ilt_write32 routine that receives a 32-bit quantity and writes it to the appropriate locations. Signed-off-by: Larry Finger<Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Fix for 4311 and 02/07/07 specification changesLarry Finger2007-02-144-119/+95
| | | | | | | | | | | | | | | | | | | | | | The specifications for the bcm43xx driver have been modified. This patch incorporates these changes in the code, which results in the BCM4311 and BCM4312 working. The name of one of the PHY parameters, previously known as "version", has been changed to "analog", short for "analog core version" . Signed-off-by: Larry Finger<Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] prism54: correct assignment of DOT1XENABLE in WE-19 codepathsDan Williams2007-02-141-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct assignment of DOT1XENABLE in WE-19 codepaths. RX_UNENCRYPTED_EAPOL = 1 really means setting DOT1XENABLE _off_, and vice versa. The original WE-19 patch erroneously reversed that. This patch fixes association with unencrypted and WEP networks when using wpa_supplicant. It also adds two missing break statements that, left out, could result in incorrect card configuration. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] zd1211rw: Readd zd_addr_t castDaniel Drake2007-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Robert P.J. Day's recent commit ("getting rid of all casts of k[cmz]alloc() calls") introduced a sparse warning for zd1211rw, related to our type-checking of addresses. zd_chip.c:116:15: warning: implicit cast to nocast type This patch readds the type cast, it is correct. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Fix for oops on resumeLarry Finger2007-02-141-1/+1
| | | | | | | | | | | | | | | | There is a kernel oops on bcm43xx when resuming due to an overly tight timeout loop. Signed-off-by: Larry Finger<Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Ignore ampdu status reportsMichael Buesch2007-02-142-13/+5
| | | | | | | | | | | | | | | | | | | | If bcm43xx were to process an afterburner (ampdu) status response, Linux would oops. The ampdu and intermediate status bits are properly named. 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] wavelan: Use ARRAY_SIZE macro when appropriateAhmed S. Darwish2007-02-142-10/+7
| | | | | | | | | | | | | | A patch to use ARRAY_SIZE macro when appropriate. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] hostap: Use ARRAY_SIZE macro when appropriateAhmed S. Darwish2007-02-141-1/+2
| | | | | | | | | | | | | | A patch to use ARRAY_SIZE macro in the Host AP wireless driver. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] misc-wireless: Use ARRAY_SIZE macro when appropriateAhmed S. Darwish2007-02-142-3/+5
| | | | | | | | | | | | | | | | A patch to use ARRAY_SIZE macro already defined in kernel.h for some miscellaneous wireless drivers with no specific maintaners. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] ipw2100: Use ARRAY_SIZE macro when appropriateAhmed S. Darwish2007-02-141-8/+6
| | | | | | | | | | | | | | A patch to use ARRAY_SIZE macro already defined in kernel.h. Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] bcm43xx: Janitorial change - remove two unused variablesLarry Finger2007-02-142-4/+0
| | | | | | | | | | | | | | Two bit-field values are extracted from the sprom data and never used. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] wireless: fix IW_IS_{GET,SET} comment in wireless.hIngo van Lil2007-02-141-2/+2
| | | | | | | | | | | | | | | | I just noticed the comments about even/odd ioctl command numbers in Linux's wireless.h file are mixed up. Signed-off-by: Ingo van Lil <inguin@gmx.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | 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 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32Linus Torvalds2007-02-167-58/+167
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32: [AVR32] Use per-controller spi_board_info structures [AVR32] Warn, don't BUG if clk_disable is called too many times [AVR32] Make sure all genclocks have a parent [AVR32] Remove unnecessary sys_nfsservctl conditional [AVR32] Wire up the SysV IPC calls properly [AVR32] Define ioremap_nocache, ioport_map and ioport_unmap [AVR32] Fix prototypes for __raw_writesb and friends
| | * | [AVR32] Use per-controller spi_board_info structuresHaavard Skinnemoen2007-02-163-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set up one spi_board_info array per controller and pass this to at32_add_device_spi so that it can set up any GPIO pins for chip selects based on this information. Extracted from a patch by David Brownell and adapted slightly. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
| | * | [AVR32] Warn, don't BUG if clk_disable is called too many timesHaavard Skinnemoen2007-02-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print a helpful warning along with a stack dump if clk_disable is called on a already-disabled clock. Remove the BUG_ON(). Extracted from a patch by David Brownell. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
OpenPOWER on IntegriCloud