leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39b2c4ebb4
linux/drivers/net/ethernet/sfc
History
David S. Miller ff4783ce78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/sfc/rx.c

Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
the rx_buf->is_page boolean into a set of u16 flags, and another to
adjust how ->ip_summed is initialized.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-02-26 21:55:51 -05:00
..
bitfield.h sfc: Minor formatting cleanup 2012-02-22 20:48:38 +00:00
efx.c ethernet: unify return value of .ndo_set_mac_address if address is invalid 2012-02-23 17:03:20 -05:00
efx.h sfc: Add support for 'extra' channel types 2012-02-16 00:25:10 +00:00
enum.h
ethtool.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
falcon_boards.c sfc: Const-qualify static data as appropriate, partly prompted by checkpatch 2012-01-09 17:08:13 +00:00
falcon_xmac.c sfc: Merge efx_mac_operations into efx_nic_type 2012-01-27 00:10:46 +00:00
falcon.c sfc: Allocate SRAM between buffer table and descriptor caches at init time 2012-02-16 00:25:12 +00:00
filter.c sfc: Add support for TX MAC filters 2012-02-16 00:11:30 +00:00
filter.h sfc: Add support for TX MAC filters 2012-02-16 00:11:30 +00:00
io.h
Kconfig sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
Makefile sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mcdi_mac.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mcdi_mon.c sfc: Minor formatting cleanup 2012-02-22 20:48:38 +00:00
mcdi_pcol.h sfc: Update MCDI (firmware interface) definitions 2012-01-09 17:08:16 +00:00
mcdi_phy.c sfc: Update MCDI (firmware interface) definitions 2012-01-09 17:08:16 +00:00
mcdi.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mcdi.h sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
mdio_10g.c sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
mdio_10g.h
mtd.c sfc: Warn if unable to create MTDs 2012-02-13 23:40:50 +00:00
net_driver.h sfc: Correct efx_for_each_possible_channel_tx_queue() to skip non-TX channels 2012-02-23 00:45:50 +00:00
nic.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
nic.h sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
phy.h
qt202x_phy.c sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
regs.h sfc: Correct MAC filter bitfield definitions 2012-02-16 00:11:31 +00:00
rx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-02-26 21:55:51 -05:00
selftest.c sfc: Remove remnants of on-load self-test 2012-01-27 00:10:55 +00:00
selftest.h sfc: Remove dependence on NAPI polling in efx_test_eventq_irq() 2012-01-27 00:10:51 +00:00
siena_sriov.c sfc: Correct validation of peer_page_count in efx_vfdi_set_status_page() 2012-02-22 20:48:08 +00:00
siena.c sfc: Add SR-IOV back-end support for SFC9000 family 2012-02-16 00:25:13 +00:00
spi.h sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
tenxpress.c sfc: Fix some formatting errors reported by checkpatch 2012-01-05 18:44:49 +00:00
tx.c sfc: Minor formatting cleanup 2012-02-22 20:48:38 +00:00
txc43128_phy.c sfc: Const-qualify static data as appropriate, partly prompted by checkpatch 2012-01-09 17:08:13 +00:00
vfdi.h sfc: Specify that the VFDI status page has page alignment and size 2012-02-22 20:48:07 +00:00
workarounds.h