summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Dalton <mwdalton@google.com>2014-01-17 10:27:08 +0100
committerDavid S. Miller <davem@davemloft.net>2014-01-18 03:58:38 +0100
commit8cabd6a06c01499507e1ff8d641cad656cca613b (patch)
tree5975404c82e3873b4ae20136ecd11cee5e9ad37e
parentMerge branch 'ixgbe' (diff)
downloadlinux-8cabd6a06c01499507e1ff8d641cad656cca613b.tar.xz
linux-8cabd6a06c01499507e1ff8d641cad656cca613b.zip
virtio-net: fix build error when CONFIG_AVERAGE is not enabled
Commit ab7db91705e9 ("virtio-net: auto-tune mergeable rx buffer size for improved performance") introduced a virtio-net dependency on EWMA. The inclusion of EWMA is controlled by CONFIG_AVERAGE. Fix build error when CONFIG_AVERAGE is not enabled by adding select AVERAGE to virtio-net's Kconfig entry. Build failure reported using config make ARCH=s390 defconfig. Signed-off-by: Michael Dalton <mwdalton@google.com> Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b45b240889f5..f342278539d5 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -236,6 +236,7 @@ config VETH
config VIRTIO_NET
tristate "Virtio network driver"
depends on VIRTIO
+ select AVERAGE
---help---
This is the virtual network driver for virtio. It can be used with
lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.