summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2010-08-25Revert "bna: Brocade 10Gb Ethernet device driver"Stephen Rothwell
This reverts commit 8b230ed8ec96c933047dd0625cf95f739e4939a6.
2010-08-25Revert "bna: Delete get_flags and set_flags ethtool methods."Stephen Rothwell
This reverts commit f04b4dd2b1f533cef0507e0410ffc6732d21a272.
2010-08-25Revert "PCI: PCIe: Ask BIOS for control of all native services at once"Stephen Rothwell
This reverts commit 28eb5f274a305bf3a13b2c80c4804d4515d05c64.
2010-08-25Revert "PCI: PCIe: Disable PCIe port services during port initialization"Stephen Rothwell
This reverts commit 2bd50dd800b52245294cfceb56be62020cdc7515.
2010-08-25Revert "PCI: PCIe: Move PCIe PME code to the pcie directory"Stephen Rothwell
This reverts commit 271fb719cc472af3b1e96d8c527bb0da7060a172.
2010-08-25Merge remote branch 'drivers-x86/linux-next'Stephen Rothwell
Conflicts: drivers/platform/x86/Kconfig
2010-08-25Merge remote branch 'lost-spurious-irq/lost-spurious-irq'Stephen Rothwell
Conflicts: drivers/ata/libata-core.c include/linux/libata.h
2010-08-25Merge remote branch 'tip/auto-latest'Stephen Rothwell
2010-08-25Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-08-25Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild
2010-08-25Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-08-25Merge branch 'quilt/aoe'Stephen Rothwell
2010-08-25Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-08-25Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-08-25Merge remote branch 'mfd/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-08-25Merge remote branch 'battery/master'Stephen Rothwell
2010-08-25Merge remote branch 'block/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'input/next'Stephen Rothwell
2010-08-25Merge remote branch 'cpufreq/next'Stephen Rothwell
2010-08-25Merge remote branch 'sound-asoc/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c
2010-08-25Merge remote branch 'wireless/master'Stephen Rothwell
Conflicts: drivers/net/wireless/libertas/if_sdio.c
2010-08-25Merge remote branch 'net/master'Stephen Rothwell
2010-08-25Merge remote branch 'async_tx/next'Stephen Rothwell
2010-08-25Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'infiniband/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'libata/NEXT'Stephen Rothwell
2010-08-25Merge remote branch 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/IR/ir-raw-event.c drivers/media/video/s5p-fimc/fimc-core.c
2010-08-25Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2010-08-25Merge branch 'quilt/i2c'Stephen Rothwell
2010-08-25Merge remote branch 'hid/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'pci/linux-next'Stephen Rothwell
2010-08-25Merge remote branch 'ceph/for-next'Stephen Rothwell
Conflicts: net/Makefile
2010-08-25Merge remote branch 'sh/master'Stephen Rothwell
2010-08-25Merge remote branch 'microblaze/next'Stephen Rothwell
2010-08-25Merge remote branch 'm68knommu/for-next'Stephen Rothwell
2010-08-25Merge remote branch 'crypto-current/master'Stephen Rothwell
2010-08-25Merge remote branch 'pci-current/for-linus'Stephen Rothwell
2010-08-24mlx4_en: Fix build warning in mlx4_en_create_rx_ring.David S. Miller
drivers/net/mlx4/en_rx.c: In function ‘mlx4_en_create_rx_ring’: drivers/net/mlx4/en_rx.c:305: warning: label ‘err_map’ defined but not used Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: updated driver versionYevgeny Petrilin
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: Moving to work with GROYevgeny Petrilin
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: UDP RSS supportYevgeny Petrilin
Adding capability for RSS for UDP traffic, hashing is done based on IP addresses and UDP port number. The support depends on HW/FW capabilities. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: reconfiguring mac address.Yevgeny Petrilin
When Mac address is removed from one port of the CX2 device, the other device should reconfigure its Mac. This fixes an issue with failover, when both ports have the same Mac address, and one of the ports, is closed, the second one stops receiving traffic. (bugzilla #1965 at bugs.openfabrics.org) Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: get/set ringsize uses actual ring sizeYevgeny Petrilin
In case that the rings were not fully filled, the report in Ethtool should be according to the actual size that was filled. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: Fixing report in Ethtool get_settingsYevgeny Petrilin
The report now based on query from FW, giving the correct tranciever type and link speed. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: Added self diagnostics test implementationYevgeny Petrilin
The selftest includes 5 features: 1. Interrupt test: Executing commands and receiving command completion on all our interrupt vectors. 2. Link test: Verifying we are connected to valid link partner. 3. Speed test: Check that we negotiated link speed correctly. 4. Registers test: Activate HW health check command. 5. Loopback test: Send a packet on loopback interface and catch it on RX side. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: Validate port up prior to transmittingYevgeny Petrilin
We might try to use resources which were not activated. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
2010-08-24mlx4_en: Reporting link state with KERN_INFOYevgeny Petrilin
Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>