From b49919b45aec73aa08d144a7596e8086b7465fa6 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Wed, 7 Jul 2010 23:52:37 +0000
Subject: [PATCH] --- yaml --- r: 203421 b: refs/heads/master c:
 57b2eaf7ddeae307fac202d82a6fabf5976e575b h: refs/heads/master i:   203419:
 4b624746e2af71e03546a5f4e7927965e7e82c98 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/net/cxgb4vf/sge.c | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index b482336aa55b..9bbe72ab66b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a204b48ed4dc31acf61090e530430ce3272b6aab
+refs/heads/master: 57b2eaf7ddeae307fac202d82a6fabf5976e575b
diff --git a/trunk/drivers/net/cxgb4vf/sge.c b/trunk/drivers/net/cxgb4vf/sge.c
index 3a7c02f98a4d..4bc1858dc303 100644
--- a/trunk/drivers/net/cxgb4vf/sge.c
+++ b/trunk/drivers/net/cxgb4vf/sge.c
@@ -228,15 +228,11 @@ static inline bool is_buf_mapped(const struct rx_sw_desc *sdesc)
  */
 static inline int need_skb_unmap(void)
 {
-	/*
-	 * This structure is used to tell if the platfrom needs buffer
-	 * unmapping by checking if DECLARE_PCI_UNMAP_ADDR defines anything.
-	 */
-	struct dummy {
-		DECLARE_PCI_UNMAP_ADDR(addr);
-	};
-
-	return sizeof(struct dummy) != 0;
+#ifdef CONFIG_NEED_DMA_MAP_STATE
+	return 1;
+#else
+	return 0;
+#endif
 }
 
 /**