Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / infiniband / core / mad_priv.h

diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h
index d5548e7..8b75010 100644 (file)
--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@@ -39,7 +39,6 @@
 
 #include <linux/completion.h>
 #include <linux/err.h>
-#include <linux/pci.h>
 #include <linux/workqueue.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
@@ -73,7 +72,7 @@ struct ib_mad_private_header {
        struct ib_mad_list_head mad_list;
        struct ib_mad_recv_wc recv_wc;
        struct ib_wc wc;
-       DECLARE_PCI_UNMAP_ADDR(mapping)
+       u64 mapping;
 } __attribute__ ((packed));
 
 struct ib_mad_private {
@@ -126,13 +125,14 @@ struct ib_mad_send_wr_private {
        struct list_head agent_list;
        struct ib_mad_agent_private *mad_agent_priv;
        struct ib_mad_send_buf send_buf;
-       DECLARE_PCI_UNMAP_ADDR(header_mapping)
-       DECLARE_PCI_UNMAP_ADDR(payload_mapping)
+       u64 header_mapping;
+       u64 payload_mapping;
        struct ib_send_wr send_wr;
        struct ib_sge sg_list[IB_MAD_SEND_REQ_MAX_SG];
        __be64 tid;
        unsigned long timeout;
-       int retries;
+       int max_retries;
+       int retries_left;
        int retry;
        int refcount;
        enum ib_wc_status status;