aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>2005-08-14 23:39:25 +0000
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>2005-08-14 23:39:25 +0000
commit9c4675baf916de9dae82a4776297598661d51214 (patch)
tree136a79cd2ae1033a1be9139aa0e6429ef4d72db9
parent14d31a6f85898f2399d6f7bd63bf72a6e44287ff (diff)
downloadxen-9c4675baf916de9dae82a4776297598661d51214.tar.gz
xen-9c4675baf916de9dae82a4776297598661d51214.tar.bz2
xen-9c4675baf916de9dae82a4776297598661d51214.zip
Enable grant tables by default for networking. Note that the restore path
(for resume/migrate) is not yet there, but should be shortly. Signed-off-by: Steven Hand <steven@xensource.com>
-rw-r--r--linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_324
-rw-r--r--linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_644
-rw-r--r--linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_324
-rw-r--r--linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_644
4 files changed, 8 insertions, 8 deletions
diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
index 2fd6798e7d..7274d10780 100644
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
@@ -18,8 +18,8 @@ CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_NETDEV_GRANT_TX is not set
-# CONFIG_XEN_NETDEV_GRANT_RX is not set
+CONFIG_XEN_NETDEV_GRANT_TX=y
+CONFIG_XEN_NETDEV_GRANT_RX=y
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_BLKDEV_TAP is not set
# CONFIG_XEN_SHADOW_MODE is not set
diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
index 6c8a39f999..84bc803069 100644
--- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64
@@ -18,8 +18,8 @@ CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_NETDEV_BACKEND=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_NETDEV_GRANT_TX is not set
-# CONFIG_XEN_NETDEV_GRANT_RX is not set
+CONFIG_XEN_NETDEV_GRANT_TX=y
+CONFIG_XEN_NETDEV_GRANT_RX=y
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_BLKDEV_TAP is not set
# CONFIG_XEN_SHADOW_MODE is not set
diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
index 7cf0b62e43..18a5217794 100644
--- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
@@ -15,8 +15,8 @@ CONFIG_NO_IDLE_HZ=y
CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_NETDEV_GRANT_TX is not set
-# CONFIG_XEN_NETDEV_GRANT_RX is not set
+CONFIG_XEN_NETDEV_GRANT_TX=y
+CONFIG_XEN_NETDEV_GRANT_RX=y
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_BLKDEV_TAP is not set
# CONFIG_XEN_SHADOW_MODE is not set
diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64 b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
index b06dd5cad5..f238787d18 100644
--- a/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
+++ b/linux-2.6-xen-sparse/arch/xen/configs/xenU_defconfig_x86_64
@@ -15,8 +15,8 @@ CONFIG_NO_IDLE_HZ=y
CONFIG_XEN_BLKDEV_GRANT=y
CONFIG_XEN_BLKDEV_FRONTEND=y
CONFIG_XEN_NETDEV_FRONTEND=y
-# CONFIG_XEN_NETDEV_GRANT_TX is not set
-# CONFIG_XEN_NETDEV_GRANT_RX is not set
+CONFIG_XEN_NETDEV_GRANT_TX=y
+CONFIG_XEN_NETDEV_GRANT_RX=y
# CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
# CONFIG_XEN_BLKDEV_TAP is not set
# CONFIG_XEN_SHADOW_MODE is not set