OpenCloudOS-Kernel/drivers/net/sfc
David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	drivers/net/sfc/sfe4001.c
	drivers/net/wireless/libertas/cmd.c
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/rtl8187se/Kconfig
	drivers/staging/rtl8192e/Kconfig
2009-11-18 22:19:03 -08:00
..
Kconfig sfc: Use generic MDIO functions and definitions 2009-04-29 17:32:30 -07:00
Makefile sfc: Rename 'xfp' file and functions to reflect reality 2009-10-24 04:27:28 -07:00
bitfield.h sfc: Remove versioned bitfield macros 2009-10-24 04:26:56 -07:00
efx.c sfc: Move MTD probe after netdev registration and name allocation 2009-10-24 04:27:24 -07:00
efx.h sfc: Remove pointless abstraction of memory BAR number 2009-10-24 04:27:18 -07:00
enum.h sfc: Add support for Solarflare 10Xpress SFT9001 2008-12-12 22:00:17 -08:00
ethtool.c sfc: Maintain interrupt moderation values in ticks, not microseconds 2009-10-24 04:27:15 -07:00
ethtool.h netdev: drivers should make ethtool_ops const 2009-09-02 01:03:33 -07:00
falcon.c sfc: Really allow RX checksum offload to be disabled 2009-10-28 02:50:44 -07:00
falcon.h sfc: Remove declarations of nonexistent functions 2009-10-24 04:27:13 -07:00
falcon_boards.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2009-11-18 22:19:03 -08:00
falcon_gmac.c sfc: Rename register I/O header and functions used by both Falcon and Siena 2009-10-24 04:27:04 -07:00
falcon_xmac.c sfc: Rename register I/O header and functions used by both Falcon and Siena 2009-10-24 04:27:04 -07:00
io.h sfc: Rename register I/O header and functions used by both Falcon and Siena 2009-10-24 04:27:04 -07:00
mac.h sfc: Add support for sub-10G speeds 2008-12-12 21:58:17 -08:00
mdio_10g.c sfc: Remove unused code for non-autoneg speed/duplex switching 2009-10-24 04:27:26 -07:00
mdio_10g.h sfc: Remove boards.h, moving last remaining declaration to falcon.h 2009-10-24 04:26:56 -07:00
mtd.c drivers/net/sfc: fix sparse warnings: Should it be static? 2009-02-18 17:49:50 -08:00
net_driver.h sfc: Merge efx_fc_resolve() into efx_mdio_get_pause() 2009-10-24 04:27:25 -07:00
phy.h sfc: Rename 'xfp' file and functions to reflect reality 2009-10-24 04:27:28 -07:00
qt202x_phy.c sfc: Rename 'xfp' file and functions to reflect reality 2009-10-24 04:27:28 -07:00
regs.h sfc: Update hardware definitions for Siena 2009-10-24 04:27:03 -07:00
rx.c sfc: Enable heuristic selection between page and skb RX buffers 2009-10-29 21:37:07 -07:00
rx.h sfc: Replace LRO with GRO 2009-01-21 14:34:06 -08:00
selftest.c sfc: Eliminate indirect lookups of queue size constants 2009-10-24 04:27:05 -07:00
selftest.h sfc: Use generic MDIO functions and definitions 2009-04-29 17:32:30 -07:00
spi.h sfc: Clean up waits for flash/EEPROM operations 2008-12-12 21:57:35 -08:00
tenxpress.c sfc: Update hardware definitions for Siena 2009-10-24 04:27:03 -07:00
tx.c sfc: Move all TX DMA length limiting into tx.c 2009-10-24 04:27:07 -07:00
tx.h netdev: convert bulk of drivers to netdev_tx_t 2009-09-01 01:14:07 -07:00
workarounds.h sfc: Move all TX DMA length limiting into tx.c 2009-10-24 04:27:07 -07:00