aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
Commit message (Collapse)AuthorAge
* Merge branch 'master' into upstreamJeff Garzik2006-09-04
|\
| * Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-08-30
| |\ | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SUNLANCE]: Fix probing problem. [SPARC64]: Fix X server hangs due to large pages.
| | * [SUNLANCE]: Fix probing problem.Krzysztof Helt2006-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current probe table causes ledma and lebuffer "le" devices to get probed twice which is not what we want. Match just "le" and look directly at the parent to get the correct top-level node information. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [STRIP]: Fix neighbour table refcount leak.Stephen Hemminger2006-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found by inspection. The STRIP driver does neigh_lookup() but never releases. This driver shouldn't being doing gratuitous arp anyway. Untested, obviously, because of lack of hardware. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [E100]: Add module option to ignore bad EEPROM checksums.David S. Miller2006-08-30
| |/ | | | | | | | | | | | | | | | | | | | | Several people run into the situation where the E100 EEPROM contents are fine, but the checksum hasn't been set properly. This renders the device useless for them even though it would function correctly. The default is off, which retains the current behavior. 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-08-31
|\ \ | | | | | | | | | into upstream
| * | ixgb: Increment version to 1.0.112-k2Auke Kok2006-08-31
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: remove skb->dev assignmentAuke Kok2006-08-31
| | | | | | | | | | | | | | | | | | | | | Same change as e1000: remove skb->dev assignment, it's now done by netdev_alloc_skb. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: Add PCI Error recovery callbacksLinas Vepstas2006-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds PCI Error recovery callbacks to the Intel 10-gigabit ethernet ixgb device driver. Lightly tested, works. "Zhang, Yanmin" <yanmin_zhang@linux.intel.com> wrote: Both pci_disable_device and ixgb_down would access the device. It doesn't follow Documentation/pci-error-recovery.txt that error_detected shouldn't do any access to the device. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: Add buffer_info and test like e1000 has.Jesse Brandeburg2006-08-31
| | | | | | | | | | | | | | | Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: Cache-align all TX components of the adapter struct.Jesse Brandeburg2006-08-31
| | | | | | | | | | | | | | | Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: recalculate after how many descriptors to wake the queueAuke Kok2006-08-31
| | | | | | | | | | | | | | | | | | | | | Recalculate when to wake the queue using DESC_NEEDED instead of a static hardcoded number. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: Set a constant blink rate for ixgb adapter identify (1sec on, 1sec off)Jesse Brandeburg2006-08-31
| | | | | | | | | | | | | | | Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: convert dev->priv to netdev_priv(dev).Auke Kok2006-08-31
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: Convert dev_alloc_skb to netdev_alloc_skb.Auke Kok2006-08-31
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e100: increment version to 3.5.16-k2Auke Kok2006-08-31
| | | | | | | | | | | | | | | | | | Increment the version of e100 to 3.5.16-k2, increment dates. Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e100: remove skb->dev assignmentAuke Kok2006-08-31
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e100: fix error recoveryLinas Vepstas2006-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent patch in -mm3 titled "gregkh-pci-pci-don-t-enable-device-if-already-enabled.patch" causes pci_enable_device() to be a no-op if the kernel thinks that the device is already enabled. This change breaks the PCI error recovery mechanism in the e100 device driver, since, after PCI slot reset, the card is no longer enabled. This is a trivial fix for this problem. Tested. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e100: Convert e100 to use netdev_alloc_skb().Auke Kok2006-08-31
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Increment driver version to 7.2.7-k2Auke Kok2006-08-31
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: clean up skb allocation codeChristoph Hellwig2006-08-31
| | | | | | | | | | | | | | | | | | 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-31
| | | | | | | | | | | | | | | | | | | | | | | | 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-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
* | | [PATCH] skge: version 1.7Stephen Hemminger2006-08-29
| | | | | | | | | | | | | | | | | | | | | Increase version. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] skge: use ethX for irq assigmentsStephen Hemminger2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | The user level irq balance daemon uses "eth" as a way to distinquish ethernet devices. Also, by using device name it is possible to distinquish different boards. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] skge: use dev_alloc_skbStephen Hemminger2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | To avoid problems with buggy protocols that assume extra header space, use dev_alloc_skb() when allocating receive buffers. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] skge: pci bus post fixesStephen Hemminger2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | At the end of a critical section, we need to force the PCI write to complete by doing a read. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] skge: cleanup suspend/resume codeStephen Hemminger2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code for suspend/resume needs several fixes. The hardware lock should be setup in probe only, not in resume. Interrupts should be disabled during suspend, etc. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: version 1.7shemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | Change version number for this bundle. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: pci post bugshemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | Make sure that PCI write occurs before the delay. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: power down PHY when not upshemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | To save power, don't enable power to the PHY until device is brought up. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: optimize checksum offload informationshemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since many packets have the same checksum starting offset and insertion location; the driver can save the last information and only tell hardware when it changes. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: TSO mss optimizationshemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | The MSS in the transmit engine only has to change if TSO mtu changes. This means less commands to the chip when mixing TSO and regular data. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: MSI test timingshemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test for MSI IRQ could have timing issues. The PCI write needs to be pushed out before waiting, and the wait queue should be initialized before the IRQ. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: dont use force status bitshemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | Don't use force status bit. It was never implemented on all chips, or has no impact. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: use netdev_alloc_skbshemminger@osdl.org2006-08-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use netdev_alloc_skb for buffer allocation to allow for headroom. This prevents bugs in code paths that assume extra space at the front and makes sky2 behave like other drivers. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | [PATCH] sky2: remove cloned/pskb_expand_head checkshemminger@osdl.org2006-08-29
|/ / | | | | | | | | | | | | | | | | | | | | | | | | The code to handle cloned skb overwriting is unnecessary in the sky2 driver and is buggy. The bug is that pskb_expand_head can change the skb but the driver has already mapped in the header. Since the sky2 hardware doesn't need to overwrite memory, the buggy code can just be removed; it was mistakenly copied from the tg3 driver. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | Merge branch 'upstream-fixes' of ↵Jeff Garzik2006-08-24
|\ \ | | | | | | | | | git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
| * | ixgb: Increment version to 1.0.109-k4Auke Kok2006-08-16
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | ixgb: fix cache miss due to miscalculationJesse Brandeburg2006-08-16
| | | | | | | | | | | | | | | | | | | | | | | | Reduce writeback threshold by 1. We were instructing the hardware to wait until the 17th descriptor which went over the cache line limit. Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Auke Kok <auke.jan.h.kok@intel.com>
| * | ixgb: Add CX4 PHY type detection and subdevice ID.Manasi Deval2006-08-16
| | | | | | | | | | | | | | | Signed-off-by: Manasi Deval <manasi.deval@intel.com> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Increment driver version to 7.1.9-k6Auke Kok2006-08-16
| | | | | | | | | | | | Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
| * | e1000: Disable aggressive clocking on esb2 with SERDES portJeff Kirsher2006-08-16
| | | | | | | | | | | | | | | | | | | | | | | | 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>