summaryrefslogtreecommitdiff
path: root/drivers/net
AgeCommit message (Collapse)AuthorFilesLines
2006-02-03Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2-4/+27
2006-02-03[PATCH] 3c59x: collision statistic fixSteffen Klassert1-10/+23
Count the total number of packets with collisions during transmission in vp->stats.collisions. Signed-off-by: Steffen Klassert <klassert@mathematik.tu-chemnitz.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-03[TG3]: Update driver version and release date.David S. Miller1-2/+2
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-02-03[TG3]: Flush tg3_reset_task()Michael Chan2-2/+25
Make sure tg3_reset_task() is flushed in the close and suspend paths as noted by Jeff Garzik. In the close path, calling flush_scheduled_work() may cause deadlock if linkwatch_event() is on the workqueue. linkwatch_event() will try to get the rtnl_lock() which is already held by tg3_close(). So instead, we set a flag in tg3_reset_task() and tg3_close() polls the flag until it is cleared. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-02-01[PATCH] ipw2200: fix ->eeprom[EEPROM_VERSION] checkAlexey Dobriyan1-1/+1
priv->eeprom is a pointer. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Yi Zhu <yi.zhu@intel.com> Cc: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-01[PATCH] lp486e: remove SLOW_DOWN_IOAlexey Dobriyan1-2/+0
It's not used. Fix the following on alpha-eb66 as a side effect: In file included from drivers/net/lp486e.c:75: include/asm/io.h:20:1: warning: "SLOW_DOWN_IO" redefined drivers/net/lp486e.c:59:1: warning: this is the location of the previous definition Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-01Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/bnx2-2.6Linus Torvalds3-524/+643
2006-02-01[SUNGEM]: Unbreak Sun GEM chips.David S. Miller1-30/+25
Revert: 40727198bfb2ce5842a6e8c7f89cf8a40ff7bf14 These PHY changes hang the sungem driver on startup with Sun chips on sparc64. Hopefully we can redo these changes in a way that doesn't break non-Apple systems. Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-31Merge branch 'upstream-fixes' of ↵Linus Torvalds10-96/+115
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
2006-01-31[PATCH] Clarify help text of SKGE/SK98LIN/SKY2Daniel Drake1-3/+25
Some users have commented that it is unclear which driver they should be using for their Marvell/SysKonnect network adapter, and which ones are/aren't interchangable. This patch attempts to reduce the confusion. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-31Merge branch 'upstream-fixes' of ↵Jeff Garzik3-26/+32
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2006-01-31[PATCH] PCMCIA=m, HOSTAP_CS=y is not a legal configurationAdrian Bunk1-1/+1
CONFIG_PCMCIA=m, CONFIG_HOSTAP_CS=y doesn't compile. Reported by "Gabriel C." <crazy@pimpmylinux.org>. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-01-31[PATCH] ipw2200: Fix a variable referenced after kfree() bugZhu Yi1-1/+1
Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-01-31[PATCH] ipw2200: Fix sw_reset doesn't clear the static essid problemZhu Yi1-0/+4
Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-01-31[PATCH] ipw2200: Fix "iwspy ethx off" causes kernel panicZhu Yi1-1/+0
Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-01-31[PATCH] ipw2100: Fix setting txpower failed problemZhu Yi1-13/+14
The ipw2100 driver misunderstood the parameter of txpower. Tx Power off means turn off the radio, but the driver interpret it as "can't set txpower". So when getting the txpower, it sets disabled=1 to the iwconifg tool in managed mode. And the tool will display "Tx Power off" when disabled=1. Now, in managed mode, iwconfig will not show "TX Power" if the radio is not switched off. It will only display "Tx Power off" only if the radio is killed. Signed-off-by: Hong Liu <hong.liu@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-01-31[PATCH] ipw2100: Fix a gcc compile warningZhu Yi1-10/+12
drivers/net/wireless/ipw2100.c:2236: warning: `ipw2100_match_buf' defined but not used Cc: Yi Zhu <yi.zhu@intel.com> Cc: James Ketrenos <jketreno@linux.intel.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-01-29Merge branch 'upstream-fixes' of ↵Jeff Garzik1-2/+2
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2006-01-28[PATCH] orinoco_cs: tweak Vcc debugging messagesValdis.Kletnieks@vt.edu1-2/+2
The current orinoco_cs.c can issue the exact same error message for 2 different tests that can fail. Alter them so we can tell which one of the two failed. Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com>
2006-01-27[PATCH] mv643xx_eth: Whitespace cleanupDale Farnsworth1-48/+46
Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-27[PATCH] mv643xx_eth: Update dev->last_rx on packet receivePaolo Galtieri1-0/+1
Update dev->last_rx on packet receive This fix corrects errors seen during configuration of the bonding driver. Signed-off-by: Paolo Galtieri <pgaltieri@mvista.com> Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-27[PATCH] mv643xx_eth: Fix spinlock recursion bugDale Farnsworth1-13/+0
This patch eliminates a spinlock recursion bug introduced recently. Since eth_port_send() is always called with the lock held, we simply remove the locking inside the function itself. Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-27[PATCH] s2io: scatter-gather fixAnanda Raju1-1/+1
There is a problem with fragmented skb in s2io driver version 2.0.9.4 available in 2.6.16-rc1 kernel. The adapter will fail to transmit if any scatter-gather skb arrives. This patch provides fix for the above described problem. Signed-off-by: Ananda Raju <ananda.raju@neterion.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-27[PATCH] b44: fix laptop carrier detectStephen Hemminger1-2/+3
On my laptop, the b44 device is created and the carrier state defaults to ON when created by alloc_etherdev. This means tools like NetworkManager see the carrier as On and try and bring the device up. The correct thing to do is mark the carrier as Off when device is created. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-27[PATCH] acenic: fix checking of read_eeprom_byte() return valuesEric Sesterhenn1-0/+4
tmp in ace_init is u32 thus rendering read_eeprom_byte() return values checks useless. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-27[PATCH] bonding: fix ->get_settings error checkingEric Sesterhenn1-1/+1
Since get_settings() returns a signed int and it gets checked for < 0 to catch an error, res should be a signed int too. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-24[SUNGEM]: Make PM of PHYs more reliable (#2)Benjamin Herrenschmidt1-25/+30
On my latest laptop, I've had occasional PHY dead on wakeup from sleep... the PHY would be totally unresponsive even to toggling the hard reset line until the machine is powered down... Looking closely at the code, I found some possible issues in the way we setup the MDIO lines during suspend along with slight divergences from what Darwin does when resetting it that may explain the problem. That patch change these and the problem appear to be gone for me at least... I also fixed an mdelay -> msleep while I was at it to the pmac feature code that is called when toggling the PHY reset line since sungem doesn't call it in an atomic context anymore. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>b Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Update version and copyright yearMichael Chan3-8/+7
Update version to 1.4.31 and add 2006 copyright. Skip the last digit when reporting the firmware version. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Add PHY loopback testMichael Chan1-22/+79
Enhance the ethtool loopback test with PHY loopback test. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Use netdev_priv()Michael Chan1-40/+40
Replace dev->priv with netdev_priv(dev) Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Fix nvram sizingMichael Chan2-3/+14
Add code to correctly determine nvram size. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Workaround hw interrupt bugMichael Chan1-2/+17
Add workaround for a hardware interrupt issue. When using INTA, unmasking of the interrupt and the tag update should be done separately to avoid some spurious interrupts, Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Fix UDP checksum verificationMichael Chan3-418/+439
Fix TCP/UDP checksum verification. Use status bits in the buffer descriptor instead of the checksum value to verify rx checksum. Using the checksum value will be incorrect if the UDP packet has zero in the UDP checksum field. Firmware update required for this fix. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Misc. fixesMichael Chan2-6/+15
Some misc. fixes for WoL, 5708 B1, and a typo '=' instead of '=='. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Improve handshake with firmwareMichael Chan2-23/+25
Improve handshake with bootcode with the following changes: 1. Increase timeout to 100msec and use msleep instead of udelay. 2. Add more error checking for timeouts and errors. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-24[BNX2]: Fix VLAN on ASFMichael Chan2-3/+8
Always set up the device to strip incoming VLAN tags when ASF is enabled. ASF firmware will not parse packets correctly if VLAN tags are not stripped. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-19[PATCH] uml: arch Kconfig menu cleanupsPaolo 'Blaisorblade' Giarrusso1-0/+1
*) mark as "EXPERIMENTAL" various items that either aren't very stable or that are actively crashing the setup of users which don't really need them (i.e. HIGHMEM and 3-level pagetables on x86 - nobody needs either, everybody reports "I'm using it and getting trouble"). *) move net/Kconfig near to the rest of network configurations, and drivers/block/Kconfig near "Block layer" submenu. *) it's useless and doesn't work well to force NETDEVICES on and to disable the prompt like it's done. Better remove the attempt, and change that to a simple "default y if UML". *) drop the warning about "report problems about HPPFS" - it's redundant anyway, as that's the usual procedure, and HPPFS users are especially technical (i.e. they know reporting bugs is _good_). Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-19Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds1-4/+32
2006-01-19[CASSINI]: dont touch page_countNick Piggin1-4/+32
Remove page refcount manipulations from cassini driver by using another field in struct page. Needed for lockless pagecache. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-19[PATCH] e1000: fix compile warningJesse Brandeburg1-1/+1
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-19[PATCH] e1000: fix receive breakageJesse Brandeburg1-11/+26
in attempting to not send the "prefetch" patch, we broke the receive code, this patch fixes that issue. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-19[PATCH] e1000: Added driver commentsJesse Brandeburg1-5/+67
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-19[PATCH] e1000: Fix whitespaceJesse Brandeburg6-441/+443
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-19[PATCH] e1000: Added functions declarationsJesse Brandeburg1-0/+3
Added e1000_mc_addr_list_update Added e1000_read_reg_io Added e1000_enable_pciex_master These are not static functions, that is why we have them declared in the header. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-19[PATCH] e1000: Added functions to save and restore configJesse Brandeburg1-2/+58
These functions help restore the driver to active configuration when coming out of resume for power management. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-19[PATCH] e1000: Added RX buffer enhancementsJesse Brandeburg1-59/+78
Align the prefetches to a dword to help speed them up. Recycle skb's and early replenish. Force memory writes to complete before fetching more descriptors. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-19[PATCH] e1000: Added disable packet split capabilityJesse Brandeburg2-2/+11
Adds the ability to disability packet split at compile time and use the legacy receive path on PCI express hardware. Made this a CONFIG option and modified the Kconfig, to reflect the new option. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-18Merge branch 'upstream-linus' of ↵Linus Torvalds37-1576/+1929
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
2006-01-18[PATCH] skge: fix dma mask setup.Stephen Hemminger1-5/+15
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 <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-18[PATCH] Fix warning with b44.c on 64bit boxesAlan Cox1-1/+1
sizeof() return is not an int, so use max_t to get the types right. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
generated by cgit v1.2.3 (git 2.39.0) at 2025-01-26 01:26:52 +0300