IB/core cleanup: Add const on args - device->process_mad

The process_mad device function declares some parameters as "in".  Make those
parameters const and adjust the call tree under process_mad in the various
drivers accordingly.

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Hal Rosenstock <hal@mellanox.com>
Reviewed-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index d396c39918deffa11bf50deb908e26ec3f56abdc..0f007a6b188ba4698de4f36dce59cb8662caef77 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -582,9 +582,9 @@ static int c2_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 static int c2_process_mad(struct ib_device *ibdev,
                          int mad_flags,
                          u8 port_num,
-                         struct ib_wc *in_wc,
-                         struct ib_grh *in_grh,
-                         struct ib_mad *in_mad, struct ib_mad *out_mad)
+                         const struct ib_wc *in_wc,
+                         const struct ib_grh *in_grh,
+                         const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        pr_debug("%s:%u\n", __func__, __LINE__);
        return -ENOSYS;

diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 061ef08c92e280e56ff0d0d33d18b5b0cc6cfb23..19c830ecbb673aae2918317c68f288f2db422eae 100644 (file)
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -85,9 +85,9 @@ static int iwch_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 static int iwch_process_mad(struct ib_device *ibdev,
                            int mad_flags,
                            u8 port_num,
-                           struct ib_wc *in_wc,
-                           struct ib_grh *in_grh,
-                           struct ib_mad *in_mad, struct ib_mad *out_mad)
+                           const struct ib_wc *in_wc,
+                           const struct ib_grh *in_grh,
+                           const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        return -ENOSYS;
 }

diff --git a/drivers/infiniband/hw/cxgb4/provider.c b/drivers/infiniband/hw/cxgb4/provider.c
index ef08a9f294513f1bd1dcacba1ef7946103de9722..75ea26a32076997a273d2fc9aadbe693cdeffe9b 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/provider.c
+++ b/drivers/infiniband/hw/cxgb4/provider.c
@@ -80,8 +80,9 @@ static int c4iw_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 }
 
 static int c4iw_process_mad(struct ib_device *ibdev, int mad_flags,
-                           u8 port_num, struct ib_wc *in_wc,
-                           struct ib_grh *in_grh, struct ib_mad *in_mad,
+                           u8 port_num, const struct ib_wc *in_wc,
+                           const struct ib_grh *in_grh,
+                           const struct ib_mad *in_mad,
                            struct ib_mad *out_mad)
 {
        return -ENOSYS;

diff --git a/drivers/infiniband/hw/ehca/ehca_iverbs.h b/drivers/infiniband/hw/ehca/ehca_iverbs.h
index 077185b3fbd68d26419945b9239ebdca15ca78f1..582fc71a84882820b6ffdc941a82f58aaa734fe7 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_iverbs.h
+++ b/drivers/infiniband/hw/ehca/ehca_iverbs.h
@@ -191,8 +191,8 @@ int ehca_dealloc_ucontext(struct ib_ucontext *context);
 int ehca_mmap(struct ib_ucontext *context, struct vm_area_struct *vma);
 
 int ehca_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                    struct ib_wc *in_wc, struct ib_grh *in_grh,
-                    struct ib_mad *in_mad,
+                    const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                    const struct ib_mad *in_mad,
                     struct ib_mad *out_mad);
 
 void ehca_poll_eqs(unsigned long data);

diff --git a/drivers/infiniband/hw/ehca/ehca_sqp.c b/drivers/infiniband/hw/ehca/ehca_sqp.c
index dba8f9f8b9964bcfe61a899b6a7c5e2500b807dc..889ccfda640104acee6736a4db87149c9eeed712 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_sqp.c
+++ b/drivers/infiniband/hw/ehca/ehca_sqp.c
@@ -140,10 +140,10 @@ struct vertcfl {
 } __attribute__ ((packed));
 
 static int ehca_process_perf(struct ib_device *ibdev, u8 port_num,
-                            struct ib_wc *in_wc, struct ib_grh *in_grh,
-                            struct ib_mad *in_mad, struct ib_mad *out_mad)
+                            const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                            const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
-       struct ib_perf *in_perf = (struct ib_perf *)in_mad;
+       const struct ib_perf *in_perf = (const struct ib_perf *)in_mad;
        struct ib_perf *out_perf = (struct ib_perf *)out_mad;
        struct ib_class_port_info *poi =
                (struct ib_class_port_info *)out_perf->data;
@@ -187,8 +187,8 @@ static int ehca_process_perf(struct ib_device *ibdev, u8 port_num,
 
                /* if request was globally routed, copy route info */
                if (in_grh) {
-                       struct vertcfl *vertcfl =
-                               (struct vertcfl *)&in_grh->version_tclass_flow;
+                       const struct vertcfl *vertcfl =
+                               (const struct vertcfl *)&in_grh->version_tclass_flow;
                        memcpy(poi->redirect_gid, in_grh->dgid.raw,
                               sizeof(poi->redirect_gid));
                        tcslfl->tc        = vertcfl->tc;
@@ -217,8 +217,8 @@ perf_reply:
 }
 
 int ehca_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                    struct ib_wc *in_wc, struct ib_grh *in_grh,
-                    struct ib_mad *in_mad, struct ib_mad *out_mad)
+                    const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                    const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        int ret;
 

diff --git a/drivers/infiniband/hw/ipath/ipath_mad.c b/drivers/infiniband/hw/ipath/ipath_mad.c
index e890e5ba0e011b550d98442c192477fea19d4a34..9e8929e23740a6b2fca967eaf49a378ce8ea65e1 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_mad.c
+++ b/drivers/infiniband/hw/ipath/ipath_mad.c
@@ -1257,7 +1257,7 @@ static int recv_pma_set_portcounters_ext(struct ib_pma_mad *pmp,
 }
 
 static int process_subn(struct ib_device *ibdev, int mad_flags,
-                       u8 port_num, struct ib_mad *in_mad,
+                       u8 port_num, const struct ib_mad *in_mad,
                        struct ib_mad *out_mad)
 {
        struct ib_smp *smp = (struct ib_smp *)out_mad;
@@ -1389,7 +1389,7 @@ bail:
 }
 
 static int process_perf(struct ib_device *ibdev, u8 port_num,
-                       struct ib_mad *in_mad,
+                       const struct ib_mad *in_mad,
                        struct ib_mad *out_mad)
 {
        struct ib_pma_mad *pmp = (struct ib_pma_mad *)out_mad;
@@ -1490,8 +1490,8 @@ bail:
  * This is called by the ib_mad module.
  */
 int ipath_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                     struct ib_wc *in_wc, struct ib_grh *in_grh,
-                     struct ib_mad *in_mad, struct ib_mad *out_mad)
+                     const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                     const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        int ret;
 

diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.h b/drivers/infiniband/hw/ipath/ipath_verbs.h
index ae6cff4abffce9550d74a71c7097fd15bb7b9abc..7a2b6a17f84437cce444a2dc743e683a942f2d8c 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_verbs.h
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.h
@@ -701,9 +701,9 @@ static inline void ipath_schedule_send(struct ipath_qp *qp)
 int ipath_process_mad(struct ib_device *ibdev,
                      int mad_flags,
                      u8 port_num,
-                     struct ib_wc *in_wc,
-                     struct ib_grh *in_grh,
-                     struct ib_mad *in_mad, struct ib_mad *out_mad);
+                     const struct ib_wc *in_wc,
+                     const struct ib_grh *in_grh,
+                     const struct ib_mad *in_mad, struct ib_mad *out_mad);
 
 /*
  * Compare the lower 24 bits of the two values.

diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 9cd2b002d7ae57fb4f33944cbaa14a3e2a27dedd..614ac6f07ae1490b50f715f2bb8fa45452cbb589 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -111,8 +111,9 @@ __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
 }
 
 int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int mad_ifc_flags,
-                int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
-                void *in_mad, void *response_mad)
+                int port, const struct ib_wc *in_wc,
+                const struct ib_grh *in_grh,
+                const void *in_mad, void *response_mad)
 {
        struct mlx4_cmd_mailbox *inmailbox, *outmailbox;
        void *inbox;
@@ -220,7 +221,7 @@ static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)
  * Snoop SM MADs for port info, GUID info, and  P_Key table sets, so we can
  * synthesize LID change, Client-Rereg, GID change, and P_Key change events.
  */
-static void smp_snoop(struct ib_device *ibdev, u8 port_num, struct ib_mad *mad,
+static void smp_snoop(struct ib_device *ibdev, u8 port_num, const struct ib_mad *mad,
                      u16 prev_lid)
 {
        struct ib_port_info *pinfo;
@@ -356,7 +357,7 @@ static void node_desc_override(struct ib_device *dev,
        }
 }
 
-static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, struct ib_mad *mad)
+static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, const struct ib_mad *mad)
 {
        int qpn = mad->mad_hdr.mgmt_class != IB_MGMT_CLASS_SUBN_LID_ROUTED;
        struct ib_mad_send_buf *send_buf;
@@ -722,8 +723,8 @@ static int mlx4_ib_demux_mad(struct ib_device *ibdev, u8 port,
 }
 
 static int ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                       struct ib_wc *in_wc, struct ib_grh *in_grh,
-                       struct ib_mad *in_mad, struct ib_mad *out_mad)
+                       const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                       const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        u16 slid, prev_lid = 0;
        int err;
@@ -825,8 +826,8 @@ static void edit_counter(struct mlx4_counter *cnt,
 }
 
 static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                       struct ib_wc *in_wc, struct ib_grh *in_grh,
-                       struct ib_mad *in_mad, struct ib_mad *out_mad)
+                       const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                       const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        struct mlx4_cmd_mailbox *mailbox;
        struct mlx4_ib_dev *dev = to_mdev(ibdev);
@@ -866,8 +867,8 @@ static int iboe_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
 }
 
 int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                       struct ib_wc *in_wc, struct ib_grh *in_grh,
-                       struct ib_mad *in_mad, struct ib_mad *out_mad)
+                       const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                       const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        switch (rdma_port_get_link_layer(ibdev, port_num)) {
        case IB_LINK_LAYER_INFINIBAND:

diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
index fce3934372a161680e4e4f2dd9716963e1178790..645d55ef06040babcfb6d6c229411e9095d886ac 100644 (file)
--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
@@ -706,11 +706,11 @@ int mlx4_ib_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *wr,
                      struct ib_recv_wr **bad_wr);
 
 int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int mad_ifc_flags,
-                int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
-                void *in_mad, void *response_mad);
+                int port, const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                const void *in_mad, void *response_mad);
 int mlx4_ib_process_mad(struct ib_device *ibdev, int mad_flags,        u8 port_num,
-                       struct ib_wc *in_wc, struct ib_grh *in_grh,
-                       struct ib_mad *in_mad, struct ib_mad *out_mad);
+                       const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                       const struct ib_mad *in_mad, struct ib_mad *out_mad);
 int mlx4_ib_mad_init(struct mlx4_ib_dev *dev);
 void mlx4_ib_mad_cleanup(struct mlx4_ib_dev *dev);
 

diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c
index 9cf9a37bb5ff9360303a0ea9197869b5fcfbaefc..34e519cd4c6419e34246ee9d3c0117949b1d0062 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mad.c
+++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -41,8 +41,8 @@ enum {
 };
 
 int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,
-                u8 port, struct ib_wc *in_wc, struct ib_grh *in_grh,
-                void *in_mad, void *response_mad)
+                u8 port, const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                const void *in_mad, void *response_mad)
 {
        u8 op_modifier = 0;
 
@@ -58,8 +58,8 @@ int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,
 }
 
 int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                       struct ib_wc *in_wc, struct ib_grh *in_grh,
-                       struct ib_mad *in_mad, struct ib_mad *out_mad)
+                       const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                       const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        u16 slid;
        int err;

diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index dff1cfcdf476cfed06d8835cd5316d234df09e1e..c6219032d00cc75cb25c0860773e4df95d185e59 100644 (file)
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -525,8 +525,8 @@ void __mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 qpn, struct mlx5_ib_srq *srq)
 void mlx5_ib_cq_clean(struct mlx5_ib_cq *cq, u32 qpn, struct mlx5_ib_srq *srq);
 void mlx5_ib_free_srq_wqe(struct mlx5_ib_srq *srq, int wqe_index);
 int mlx5_MAD_IFC(struct mlx5_ib_dev *dev, int ignore_mkey, int ignore_bkey,
-                u8 port, struct ib_wc *in_wc, struct ib_grh *in_grh,
-                void *in_mad, void *response_mad);
+                u8 port, const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                const void *in_mad, void *response_mad);
 struct ib_ah *create_ib_ah(struct ib_ah_attr *ah_attr,
                           struct mlx5_ib_ah *ah);
 struct ib_ah *mlx5_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);
@@ -586,8 +586,8 @@ int mlx5_ib_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list,
 int mlx5_ib_unmap_fmr(struct list_head *fmr_list);
 int mlx5_ib_fmr_dealloc(struct ib_fmr *ibfmr);
 int mlx5_ib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                       struct ib_wc *in_wc, struct ib_grh *in_grh,
-                       struct ib_mad *in_mad, struct ib_mad *out_mad);
+                       const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                       const struct ib_mad *in_mad, struct ib_mad *out_mad);
 struct ib_xrcd *mlx5_ib_alloc_xrcd(struct ib_device *ibdev,
                                          struct ib_ucontext *context,
                                          struct ib_udata *udata);

diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 9d3e5c1ac60e44ca5ba1014fa43fa1e6483694ec..c7f49bbb0c72b6d6af86eb2bb42984c5e3effb17 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -1858,8 +1858,8 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
 }
 
 int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
-                 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
-                 void *in_mad, void *response_mad)
+                 int port, const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                 const void *in_mad, void *response_mad)
 {
        struct mthca_mailbox *inmailbox, *outmailbox;
        void *inbox;

diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.h b/drivers/infiniband/hw/mthca/mthca_cmd.h
index f952244c54de0d61c2ef8a6f70adb22218b8effb..d2e5b194b938b1afd3c30f12ddd6151ca89e1d38 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_cmd.h
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.h
@@ -312,8 +312,8 @@ int mthca_QUERY_QP(struct mthca_dev *dev, u32 num, int is_ee,
                   struct mthca_mailbox *mailbox);
 int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn);
 int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
-                 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
-                 void *in_mad, void *response_mad);
+                 int port, const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                 const void *in_mad, void *response_mad);
 int mthca_READ_MGM(struct mthca_dev *dev, int index,
                   struct mthca_mailbox *mailbox);
 int mthca_WRITE_MGM(struct mthca_dev *dev, int index,

diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index 7e6a6d64ad4eb1bee96b0d2d244daf20898ab3b6..b70f9ff23171f2c2c04b5f61f575ed66bc9b8db9 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -576,9 +576,9 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid);
 int mthca_process_mad(struct ib_device *ibdev,
                      int mad_flags,
                      u8 port_num,
-                     struct ib_wc *in_wc,
-                     struct ib_grh *in_grh,
-                     struct ib_mad *in_mad,
+                     const struct ib_wc *in_wc,
+                     const struct ib_grh *in_grh,
+                     const struct ib_mad *in_mad,
                      struct ib_mad *out_mad);
 int mthca_create_agents(struct mthca_dev *dev);
 void mthca_free_agents(struct mthca_dev *dev);

diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
index 8881fa376e06fa6e87b9bde29a1e1581727a0341..d54608ca08202f077e9e84cb183181f1d141d6fa 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -104,7 +104,7 @@ static void update_sm_ah(struct mthca_dev *dev,
  */
 static void smp_snoop(struct ib_device *ibdev,
                      u8 port_num,
-                     struct ib_mad *mad,
+                     const struct ib_mad *mad,
                      u16 prev_lid)
 {
        struct ib_event event;
@@ -160,7 +160,7 @@ static void node_desc_override(struct ib_device *dev,
 
 static void forward_trap(struct mthca_dev *dev,
                         u8 port_num,
-                        struct ib_mad *mad)
+                        const struct ib_mad *mad)
 {
        int qpn = mad->mad_hdr.mgmt_class != IB_MGMT_CLASS_SUBN_LID_ROUTED;
        struct ib_mad_send_buf *send_buf;
@@ -195,9 +195,9 @@ static void forward_trap(struct mthca_dev *dev,
 int mthca_process_mad(struct ib_device *ibdev,
                      int mad_flags,
                      u8 port_num,
-                     struct ib_wc *in_wc,
-                     struct ib_grh *in_grh,
-                     struct ib_mad *in_mad,
+                     const struct ib_wc *in_wc,
+                     const struct ib_grh *in_grh,
+                     const struct ib_mad *in_mad,
                      struct ib_mad *out_mad)
 {
        int err;

diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 05530e3f6ff026d1095cfcd3f84a8c0fa0f28a72..0099e419e24f02e350d58a91a4e166423357d718 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -3221,8 +3221,8 @@ static int nes_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
  * nes_process_mad
  */
 static int nes_process_mad(struct ib_device *ibdev, int mad_flags,
-               u8 port_num, struct ib_wc *in_wc, struct ib_grh *in_grh,
-               struct ib_mad *in_mad, struct ib_mad *out_mad)
+               u8 port_num, const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+               const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        nes_debug(NES_DBG_INIT, "\n");
        return -ENOSYS;

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
index d812904f398473d1502bb979d6d822c04b55f2b8..3216bce08a106411f2939a681bc08fd696da60a1 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.c
@@ -196,9 +196,9 @@ int ocrdma_modify_ah(struct ib_ah *ibah, struct ib_ah_attr *attr)
 int ocrdma_process_mad(struct ib_device *ibdev,
                       int process_mad_flags,
                       u8 port_num,
-                      struct ib_wc *in_wc,
-                      struct ib_grh *in_grh,
-                      struct ib_mad *in_mad, struct ib_mad *out_mad)
+                      const struct ib_wc *in_wc,
+                      const struct ib_grh *in_grh,
+                      const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        int status;
        struct ocrdma_dev *dev;

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_ah.h b/drivers/infiniband/hw/ocrdma/ocrdma_ah.h
index 726a87cf22dcb215d2a105f08a054395bb0c6804..5c4ae3eba47c4339cd9e3667f44e8c29c381de2c 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_ah.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_ah.h
@@ -42,7 +42,7 @@ int ocrdma_modify_ah(struct ib_ah *, struct ib_ah_attr *);
 int ocrdma_process_mad(struct ib_device *,
                       int process_mad_flags,
                       u8 port_num,
-                      struct ib_wc *in_wc,
-                      struct ib_grh *in_grh,
-                      struct ib_mad *in_mad, struct ib_mad *out_mad);
+                      const struct ib_wc *in_wc,
+                      const struct ib_grh *in_grh,
+                      const struct ib_mad *in_mad, struct ib_mad *out_mad);
 #endif                         /* __OCRDMA_AH_H__ */

diff --git a/drivers/infiniband/hw/qib/qib_mad.c b/drivers/infiniband/hw/qib/qib_mad.c
index 395f4046dba2054633ad41f4a0f67a4dbee57c63..6ab8ab89d058bff898ef594573fde83d7025ccfb 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_mad.c
+++ b/drivers/infiniband/hw/qib/qib_mad.c
@@ -1854,7 +1854,7 @@ static int pma_set_portcounters_ext(struct ib_pma_mad *pmp,
 }
 
 static int process_subn(struct ib_device *ibdev, int mad_flags,
-                       u8 port, struct ib_mad *in_mad,
+                       u8 port, const struct ib_mad *in_mad,
                        struct ib_mad *out_mad)
 {
        struct ib_smp *smp = (struct ib_smp *)out_mad;
@@ -2006,7 +2006,7 @@ bail:
 }
 
 static int process_perf(struct ib_device *ibdev, u8 port,
-                       struct ib_mad *in_mad,
+                       const struct ib_mad *in_mad,
                        struct ib_mad *out_mad)
 {
        struct ib_pma_mad *pmp = (struct ib_pma_mad *)out_mad;
@@ -2299,7 +2299,7 @@ static int check_cc_key(struct qib_ibport *ibp,
 }
 
 static int process_cc(struct ib_device *ibdev, int mad_flags,
-                       u8 port, struct ib_mad *in_mad,
+                       u8 port, const struct ib_mad *in_mad,
                        struct ib_mad *out_mad)
 {
        struct ib_cc_mad *ccp = (struct ib_cc_mad *)out_mad;
@@ -2400,8 +2400,8 @@ bail:
  * This is called by the ib_mad module.
  */
 int qib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port,
-                   struct ib_wc *in_wc, struct ib_grh *in_grh,
-                   struct ib_mad *in_mad, struct ib_mad *out_mad)
+                   const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                   const struct ib_mad *in_mad, struct ib_mad *out_mad)
 {
        int ret;
        struct qib_ibport *ibp = to_iport(ibdev, port);

diff --git a/drivers/infiniband/hw/qib/qib_verbs.h b/drivers/infiniband/hw/qib/qib_verbs.h
index bfc8948fdd3592589d14c611bf16e2a626dbde39..f2f57749c07d4de1e9d44c2bf7865a1f9aa53f0f 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.h
+++ b/drivers/infiniband/hw/qib/qib_verbs.h
@@ -872,8 +872,8 @@ void qib_cap_mask_chg(struct qib_ibport *ibp);
 void qib_sys_guid_chg(struct qib_ibport *ibp);
 void qib_node_desc_chg(struct qib_ibport *ibp);
 int qib_process_mad(struct ib_device *ibdev, int mad_flags, u8 port_num,
-                   struct ib_wc *in_wc, struct ib_grh *in_grh,
-                   struct ib_mad *in_mad, struct ib_mad *out_mad);
+                   const struct ib_wc *in_wc, const struct ib_grh *in_grh,
+                   const struct ib_mad *in_mad, struct ib_mad *out_mad);
 int qib_create_agents(struct qib_ibdev *dev);
 void qib_free_agents(struct qib_ibdev *dev);
 

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/mad.c b/drivers/net/ethernet/mellanox/mlx5/core/mad.c
index ee1b0b965f34a3f4e29a71c79daf40e47693d67c..1368dac00da02a56bccdc076e662653920c91d50 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/mad.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/mad.c
@@ -36,7 +36,7 @@
 #include <linux/mlx5/cmd.h>
 #include "mlx5_core.h"
 
-int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, void *inb, void *outb,
+int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,
                      u16 opmod, u8 port)
 {
        struct mlx5_mad_ifc_mbox_in *in = NULL;

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 9a90e7523dc24d2f7f29467023c8845cbf50cff7..9ec7c93d6fa355c1760890f1265ae1d4a2dcea44 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -696,7 +696,7 @@ int mlx5_core_dump_fill_mkey(struct mlx5_core_dev *dev, struct mlx5_core_mr *mr,
                             u32 *mkey);
 int mlx5_core_alloc_pd(struct mlx5_core_dev *dev, u32 *pdn);
 int mlx5_core_dealloc_pd(struct mlx5_core_dev *dev, u32 pdn);
-int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, void *inb, void *outb,
+int mlx5_core_mad_ifc(struct mlx5_core_dev *dev, const void *inb, void *outb,
                      u16 opmod, u8 port);
 void mlx5_pagealloc_init(struct mlx5_core_dev *dev);
 void mlx5_pagealloc_cleanup(struct mlx5_core_dev *dev);

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index f19739adf80d126c627973ebe86ba2d1eb3091e8..48c9acbea53e0d6cd99be45718e89e92cc36494a 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1690,9 +1690,9 @@ struct ib_device {
        int                        (*process_mad)(struct ib_device *device,
                                                  int process_mad_flags,
                                                  u8 port_num,
-                                                 struct ib_wc *in_wc,
-                                                 struct ib_grh *in_grh,
-                                                 struct ib_mad *in_mad,
+                                                 const struct ib_wc *in_wc,
+                                                 const struct ib_grh *in_grh,
+                                                 const struct ib_mad *in_mad,
                                                  struct ib_mad *out_mad);
        struct ib_xrcd *           (*alloc_xrcd)(struct ib_device *device,
                                                 struct ib_ucontext *ucontext,