Skip to content

Commit d5df7c4

Browse files
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
2 parents 80703d2 + cd2d5b5 commit d5df7c4

File tree

21 files changed

+3170
-604
lines changed

21 files changed

+3170
-604
lines changed

drivers/net/ethernet/sfc/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,11 @@ config SFC_MCDI_MON
2626
----help---
2727
This exposes the on-board firmware-managed sensors as a
2828
hardware monitor device.
29+
config SFC_SRIOV
30+
bool "Solarflare SFC9000-family SR-IOV support"
31+
depends on SFC && PCI_IOV
32+
default y
33+
---help---
34+
This enables support for the SFC9000 I/O Virtualization
35+
features, allowing accelerated network performance in
36+
virtualized environments.

drivers/net/ethernet/sfc/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ sfc-y += efx.o nic.o falcon.o siena.o tx.o rx.o filter.o \
44
tenxpress.o txc43128_phy.o falcon_boards.o \
55
mcdi.o mcdi_phy.o mcdi_mon.o
66
sfc-$(CONFIG_SFC_MTD) += mtd.o
7+
sfc-$(CONFIG_SFC_SRIOV) += siena_sriov.o
78

89
obj-$(CONFIG_SFC) += sfc.o

0 commit comments

Comments
 (0)