Get the autobypass stuff working again. This turned out to

be surprisingly trivial.

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0f9b949835c283ed081b364dc16c50784ded728a..fa2a7b9a091f3fbad9bb92229208c28eb4ac1da9 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2757,6 +2757,15 @@ config XEN_NETDEV2_BYPASS_ENDPOINT
          significantly increase performance.  This option controls whether
          interfaces in this domain can be the endpoints of these bypasses.
 
+config XEN_NETDEV2_AUTOMATIC_BYPASS
+       bool "Try to determine automatically whether a bypass is required"
+       depends on XEN_NETDEV2_BYPASS_ENDPOINT
+       default y
+       help
+         If this is set, this endpoint will try to detect when a
+         bypass when might be useful, or when an existing bypass is no longer
+         being used, and take appropriate action
+
 config ISERIES_VETH
        tristate "iSeries Virtual Ethernet driver support"
        depends on PPC_ISERIES