From: Asias He <asias@redhat.com>
Date: Mon, 6 May 2013 08:38:20 +0000 (+0800)
Subject: vhost: Move VHOST_NET_FEATURES to net.c
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8570a6e72c5bfb1aee8225b8c4814cdc28417a20;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

vhost: Move VHOST_NET_FEATURES to net.c

vhost.h should not depend on device specific marcos like
VHOST_NET_F_VIRTIO_NET_HDR and VIRTIO_NET_F_MRG_RXBUF.

Signed-off-by: Asias He <asias@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 354665a3ecd..06b2447bce7 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -58,6 +58,12 @@ MODULE_PARM_DESC(experimental_zcopytx, "Enable Zero Copy TX;"
 
 #define VHOST_DMA_IS_DONE(len) ((len) >= VHOST_DMA_DONE_LEN)
 
+enum {
+	VHOST_NET_FEATURES = VHOST_FEATURES |
+			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |
+			 (1ULL << VIRTIO_NET_F_MRG_RXBUF),
+};
+
 enum {
 	VHOST_NET_VQ_RX = 0,
 	VHOST_NET_VQ_TX = 1,
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index cc23bc456d1..08ebf58dfcf 100644
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -178,9 +178,6 @@ enum {
 			 (1ULL << VIRTIO_RING_F_INDIRECT_DESC) |
 			 (1ULL << VIRTIO_RING_F_EVENT_IDX) |
 			 (1ULL << VHOST_F_LOG_ALL),
-	VHOST_NET_FEATURES = VHOST_FEATURES |
-			 (1ULL << VHOST_NET_F_VIRTIO_NET_HDR) |
-			 (1ULL << VIRTIO_NET_F_MRG_RXBUF),
 };
 
 static inline int vhost_has_feature(struct vhost_dev *dev, int bit)