summaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000 (follow)
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] e1000: revert 'e1000: Remove 0x1000 as supported device'Auke-Jan H Kok2006-09-131-0/+1
| | | | | | | | | | | | | The commit 'e1000: Remove 0x1000 as supported device' (Jeff Kirsher, 673a052fde79ab5e9dce569b0336358812ddba2d) Removes PIC device ID 8086:1000 from the list of supported devices. A fix was submitted for the original issue (commit 6a9516989f94df10d9a27ba543c6b53b3e69c84a). This commit reverts commit 673a052fde79ab5e9dce569b0336358812ddba2d and re-enables 82542rev3 chips completely. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* Merge branch 'upstream-fixes' into upstreamJeff Garzik2006-09-121-4/+4
|\
| * [PATCH] e1000: fix TX timout hang regression for 82542rev3Auke Kok2006-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Commit 581d708eb47cccb5f41bc0817e50c9b004011ba8 (oct. 5 2005) introduced partial Multiqueue support for e1000 which broke macro smartness in setting up head/tail registers for 82542 rev3 chipsets, making these adapters completely non-working since 2.6.15. This commit sets the proper head and tail registers for read and write descriptor rings. Ths fix was tested on an 82542 rev3 NIC and newer NICs. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | [PATCH] make drivers/net/e1000/e1000_hw.c:e1000_phy_igp_get_info() staticAdrian Bunk2006-09-061-1/+1
| | | | | | | | | | | | | | This patch makes the needlessly global e1000_phy_igp_get_info() static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | e1000: Increment driver version to 7.2.7-k2Auke Kok2006-08-311-1/+1
| | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: clean up skb allocation codeChristoph Hellwig2006-08-311-11/+6
| | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: Add PCI ID 0x10a4 for our new 4-port PCI-Express deviceJesse Brandeburg2006-08-314-0/+5
| | | | | | | | | | | | | | | | Device 0x10a4 is a double 82571 on a single PCI-Express card and has 4 gigabit capable ports. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: unify WoL capability detection codeJesse Brandeburg2006-08-313-89/+127
| | | | | | | | | | | | | | | | | | WoL is constantly giving problems and needed a rewrite. Consolidates all WoL capabilities into a single function, and disables WoL for all other ports on the device except for port A. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: Use module param array codeAuke Kok2006-08-281-51/+110
| | | | | | | | | | | | | | Use module param array code to distinguish between defaults and user specified values. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: remove unused part_num reading codeAuke Kok2006-08-283-37/+0
| | | | | | | | | | | | | | Remove the code that reads part_num from the EEPROM. This part number is never displayed or queryable by the user. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: error out if we cannot enable PCI device on resumeAuke Kok2006-08-281-2/+5
| | | | | | | | | | | | Do not ignore errors returned by pci_enable_device, instead error out. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: ring buffers resources cleanupVasily Averin2006-08-281-8/+6
| | | | | | | | | | | | | | | | | | | | Memory leak was found in 2.6.18-rc4 and e1000 7.2.7 from sourceforge: We should free resources allocated for previous rings if following allocation fails. Signed-off-by: Vasily Averin <vvs@sw.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: e1000_probe resources cleanupVasily Averin2006-08-281-16/+28
| | | | | | | | | | | | | | | | Fix resources cleanup in e1000_probe() Signed-off-by: Vasily Averin <vvs@sw.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: IRQ resources cleanupVasily Averin2006-08-281-1/+4
| | | | | | | | | | | | | | | | | | irq leak was found in 2.6.18-rc4 and e1000 7.2.7 from sourceforge: if e1000_up fails in e1000_open() we do not free allocated irq Signed-off-by: Vasily Averin <vvs@sw.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | e1000: Whitespace cleanup, cosmetic changesAuke Kok2006-08-285-554/+554
| | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | Merge branch 'upstream-fixes' of ↵Jeff Garzik2006-08-243-21/+52
|\ \ | | | | | | | | | git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
| * | e1000: Increment driver version to 7.1.9-k6Auke Kok2006-08-161-1/+1
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Disable aggressive clocking on esb2 with SERDES portJeff Kirsher2006-08-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Disable aggressive clocking on esb2 with SERDES port as it causes hardware problems. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Force full DMA clocking for 10/100 speedJeff Kirsher2006-08-161-0/+11
| | | | | | | | | | | | | | | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Allow NVM to setup LPLU for IGP2 and IGP3Jeff Kirsher2006-08-161-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Allow NVM to setup LPLU for IGP2 and IGP3. Only IGP needs LPLU D3 disabled during init here. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: explicit locking for two ethtool path functionsJesse Brandeburg2006-08-161-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | Explicitly lock two more ethtool entry points completely instead of the hardware reset only to prevent a race condition. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Explicitly power up the PHY during loopback testing.Jesse Brandeburg2006-08-162-1/+8
| | | | | | | | | | | | | | | Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Remove 0x1000 as supported deviceJeff Kirsher2006-08-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove pci ID 8086:1000 from the list fo supported devices. This device has not functioned with the driver for very long (since v. 5.2.4!) and we lack the resources to come with a substantial fix. There are only few cards of this type out there. Signed-off-by: Jeff Kirsher <Jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Same cosmetic fix as earlier sent out for IPV4.Auke Kok2006-08-161-1/+1
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | | drivers/net: Remove deprecated use of pci_module_init()Jeff Garzik2006-08-191-1/+1
| |/ |/| | | | | | | | | | | From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | [PATCH] drivers/net/e1000/: possible cleanupsAdrian Bunk2006-08-193-56/+67
|/ | | | | | | | | | | | | | | | | | | | | - make needlessly global functions static - #if 0 the following unused global functions: - e1000_hw.c: e1000_mc_addr_list_update() - e1000_hw.c: e1000_read_reg_io() - e1000_hw.c: e1000_enable_pciex_master() - e1000_hw.c: e1000_ife_disable_dynamic_power_down() - e1000_hw.c: e1000_ife_enable_dynamic_power_down() - e1000_hw.c: e1000_write_ich8_word() - e1000_hw.c: e1000_duplex_reversal() - e1000_main.c: e1000_io_read() Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: John Ronciak <john.ronciak@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Cc: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* [E1000]: Convert to netdev_alloc_skbDavid S. Miller2006-08-021-5/+6
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* e1000: bump version to 7.1.9-k4Auke Kok2006-07-151-1/+1
| | | | | | Bump the version to 7.1.9-k4 to indicate three extra changes. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* e1000: fix panic on large frame receive when mtu=defaultAuke Kok2006-07-152-2/+4
| | | | | | | | | | A panic was reported when receiving 1522 size packets if using the default MTU. we should set the initial rx buffer length to the value that e1000changemtu sets so that we can receive any packet that would not be dropped by LPE=0. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke.jan.h.kok@intel.com>
* e1000: remove CRC bytes from measured packet lengthAuke Kok2006-07-151-1/+9
| | | | | | | | After removing the hardware CRC stripping which causes problems with SOL and related issues, we need to compensate for this changed size. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* e1000: Redo netpoll fix to address community concernsAuke Kok2006-07-151-22/+15
| | | | | | | | | | The original suggested fix for netpoll was found to be racy on SMP kernels. While it is highly unlikely that this race would ever be seen in the real world due to current netpoll usage models, we implemented this updated fix to address concerns. Signed-off-by: Mitch Williams <mitch.a.williams@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* [PATCH] e1000: irq naming updateAndrew Morton2006-07-121-1/+1
| | | | | | | | | Use the new names. Cc: Auke Kok <auke-jan.h.kok@intel.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEADLinus Torvalds2006-07-101-4/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * HEAD: [AX.25]: Use kzalloc [ATM] net/atm/clip.c: fix PROC_FS=n compile [PKT_SCHED]: act_api: Fix module leak while flushing actions [NET]: Fix IPv4/DECnet routing rule dumping [NET] gso: Fix up GSO packets with broken checksums [NET] gso: Add skb_is_gso [IRDA]: fix drivers/net/irda/ali-ircc.c:ali_ircc_init() [ATM]: fix possible recursive locking in skb_migrate() [ATM]: Typo in drivers/atm/Kconfig... [TG3]: add amd8131 to "write reorder" chipsets [NET]: Fix network device interface printk message priority
| * [NET] gso: Add skb_is_gsoHerbert Xu2006-07-081-4/+3
| | | | | | | | | | | | | | | | | | | | This patch adds the wrapper function skb_is_gso which can be used instead of directly testing skb_shinfo(skb)->gso_size. This makes things a little nicer and allows us to change the primary key for indicating whether an skb is GSO (if we ever want to do that). Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* | Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ↵Jeff Garzik2006-07-057-391/+2520
|\ \ | |/ |/| | | | | | | | | | | into upstream Conflicts: drivers/net/e1000/e1000_main.c
| * e1000: increase version to 7.1.9-k2Auke Kok2006-06-271-1/+1
| | | | | | | | | | | | | | | | Increment the version to 7.1.9-k2 Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: add ich8lan device ID'sAuke Kok2006-06-271-0/+7
| | | | | | | | | | | | | | | | Add the device ID's of the supported ICH8 LAN devices. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: allow user to disable ich8 lock loss workaroundAuke Kok2006-06-271-0/+21
| | | | | | | | | | | | | | | | | | | | The workaround for the ich8 lock loss problem is only needed for a very small amount of systems. This adds an option for the user to disable the workaround. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: integrate ich8 support into driverAuke Kok2006-06-274-130/+725
| | | | | | | | | | | | | | | | This hooks up the ich8 structure into the driver itself. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: add ich8lan core functionsAuke Kok2006-06-273-7/+1392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the core new functions needed for ich8's internal NIC. This includes: * ich8 specific read/write code * flash/nvm access code * software semaphore flag functions * 10/100 PHY (fe - no gigabit speed) support for low-end versions * A workaround for a powerdown sequence problem discovered that affects a small number of motherboard. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: disable ERTAuke Kok2006-06-271-3/+0
| | | | | | | | | | | | | | | | | | | | Hardware is reported to have problems with ERT. We disable it for all hardware to make sure we are not seeing unexplainable user problems. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: check return value of _get_speed_and_duplexAuke Kok2006-06-271-2/+6
| | | | | | | | | | | | | | | | | | We were not checking the return value of get_speed_and_duplex properly, whih may contain an error value. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: M88 PHY workaroundAuke Kok2006-06-272-17/+40
| | | | | | | | | | | | | | | | | | M88 rev 2 PHY needs a longer downshift to function properly. This adds a much longer downshift counter for this specific device. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: fix adapter led blinking inconsistencyAuke Kok2006-06-273-14/+40
| | | | | | | | | | | | | | | | | | Several e1000 adapters were not blinking correctly or inconsistently. This patch cleans this up and makes them all behave the same as far as possible. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: disable CRC stripping workaroundAuke Kok2006-06-271-4/+1
| | | | | | | | | | | | | | | | | | CRC stripping is breaking SMBUS-connected BMC's. We disable this feature to make it work. This fixes related bugs regarding SOL. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: force register write flushes to circumvent broken platformsAuke Kok2006-06-272-9/+33
| | | | | | | | | | | | | | | | | | A certain AMD64 bridge (8132) has an option to turn on write combining which breaks our adapter. To circumvent this we need to flush every write. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: rework module param code with uninitialized valuesAuke Kok2006-06-271-106/+61
| | | | | | | | | | | | | | | | | | We can take uninitialized values into account which minimizes code and allows us to simplify the parameter checking code greatly. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: recycle skbAuke Kok2006-06-271-1/+2
| | | | | | | | | | | | | | | | Recycle an skb to improve performance a bit. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: change printk into DPRINTKAuke Kok2006-06-271-1/+1
| | | | | | | | | | | | | | | | | | Changing a printk message to make clear that this message is originating from e1000. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * e1000: add smart power down codeAuke Kok2006-06-273-0/+41
| | | | | | | | | | | | | | | | | | | | Smart Power Down is a power saving feature in newer e1000 hardware. We disable it because it causes time to link to be long, but make it a user choice. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>