Skip to content

Commit 9089885

Browse files
Dasaratharaman Chandramoulidledford
Dasaratharaman Chandramouli
authored and
dledford
committed
IB/core: Rename struct ib_ah_attr to rdma_ah_attr
This patch simply renames struct ib_ah_attr to rdma_ah_attr as these fields specify attributes that are not necessarily specific to IB. Reviewed-by: Ira Weiny <[email protected]> Reviewed-by: Don Hiatt <[email protected]> Reviewed-by: Niranjana Vishwanathapura <[email protected]> Reviewed-by: Sean Hefty <[email protected]> Signed-off-by: Dasaratharaman Chandramouli <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent eca7ddf commit 9089885

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+155
-144
lines changed

‎drivers/infiniband/core/cm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ struct cm_device {
228228
struct cm_av {
229229
struct cm_port *port;
230230
union ib_gid dgid;
231-
struct ib_ah_attr ah_attr;
231+
struct rdma_ah_attr ah_attr;
232232
u16 pkey_index;
233233
u8 timeout;
234234
};

‎drivers/infiniband/core/mad.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,7 @@ static inline int rcv_has_same_gid(const struct ib_mad_agent_private *mad_agent_
18331833
const struct ib_mad_send_wr_private *wr,
18341834
const struct ib_mad_recv_wc *rwc )
18351835
{
1836-
struct ib_ah_attr attr;
1836+
struct rdma_ah_attr attr;
18371837
u8 send_resp, rcv_resp;
18381838
union ib_gid sgid;
18391839
struct ib_device *device = mad_agent_priv->agent.device;

‎drivers/infiniband/core/mad_rmpp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -852,7 +852,7 @@ static int init_newwin(struct ib_mad_send_wr_private *mad_send_wr)
852852
struct ib_mad_agent_private *agent = mad_send_wr->mad_agent_priv;
853853
struct ib_mad_hdr *mad_hdr = mad_send_wr->send_buf.mad;
854854
struct mad_rmpp_recv *rmpp_recv;
855-
struct ib_ah_attr ah_attr;
855+
struct rdma_ah_attr ah_attr;
856856
unsigned long flags;
857857
int newwin = 1;
858858

‎drivers/infiniband/core/multicast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num,
720720
struct ib_sa_mcmember_rec *rec,
721721
struct net_device *ndev,
722722
enum ib_gid_type gid_type,
723-
struct ib_ah_attr *ah_attr)
723+
struct rdma_ah_attr *ah_attr)
724724
{
725725
int ret;
726726
u16 gid_index;

‎drivers/infiniband/core/sa_query.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,7 +1099,8 @@ static u8 get_src_path_mask(struct ib_device *device, u8 port_num)
10991099
}
11001100

11011101
int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
1102-
struct ib_sa_path_rec *rec, struct ib_ah_attr *ah_attr)
1102+
struct ib_sa_path_rec *rec,
1103+
struct rdma_ah_attr *ah_attr)
11031104
{
11041105
int ret;
11051106
u16 gid_index;
@@ -2011,7 +2012,7 @@ static void update_sm_ah(struct work_struct *work)
20112012
container_of(work, struct ib_sa_port, update_task);
20122013
struct ib_sa_sm_ah *new_ah;
20132014
struct ib_port_attr port_attr;
2014-
struct ib_ah_attr ah_attr;
2015+
struct rdma_ah_attr ah_attr;
20152016

20162017
if (ib_query_port(port->agent->device, port->port_num, &port_attr)) {
20172018
pr_warn("Couldn't query port\n");

‎drivers/infiniband/core/user_mad.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ static void recv_handler(struct ib_mad_agent *agent,
235235
packet->mad.hdr.pkey_index = mad_recv_wc->wc->pkey_index;
236236
packet->mad.hdr.grh_present = !!(mad_recv_wc->wc->wc_flags & IB_WC_GRH);
237237
if (packet->mad.hdr.grh_present) {
238-
struct ib_ah_attr ah_attr;
238+
struct rdma_ah_attr ah_attr;
239239

240240
ib_init_ah_from_wc(agent->device, agent->port_num,
241241
mad_recv_wc->wc, mad_recv_wc->recv_buf.grh,
@@ -449,7 +449,7 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
449449
struct ib_umad_file *file = filp->private_data;
450450
struct ib_umad_packet *packet;
451451
struct ib_mad_agent *agent;
452-
struct ib_ah_attr ah_attr;
452+
struct rdma_ah_attr ah_attr;
453453
struct ib_ah *ah;
454454
struct ib_rmpp_mad *rmpp_mad;
455455
__be64 *tid;

‎drivers/infiniband/core/uverbs_cmd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,7 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file,
25192519
struct ib_uobject *uobj;
25202520
struct ib_pd *pd;
25212521
struct ib_ah *ah;
2522-
struct ib_ah_attr attr;
2522+
struct rdma_ah_attr attr;
25232523
int ret;
25242524
struct ib_udata udata;
25252525

‎drivers/infiniband/core/uverbs_marshall.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <rdma/ib_marshall.h>
3535

3636
void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
37-
struct ib_ah_attr *src)
37+
struct rdma_ah_attr *src)
3838
{
3939
memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved));
4040
dst->dlid = src->dlid;

‎drivers/infiniband/core/verbs.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ EXPORT_SYMBOL(ib_dealloc_pd);
311311

312312
/* Address handles */
313313

314-
struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
314+
struct ib_ah *ib_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr)
315315
{
316316
struct ib_ah *ah;
317317

@@ -452,7 +452,7 @@ EXPORT_SYMBOL(ib_get_gids_from_rdma_hdr);
452452

453453
int ib_init_ah_from_wc(struct ib_device *device, u8 port_num,
454454
const struct ib_wc *wc, const struct ib_grh *grh,
455-
struct ib_ah_attr *ah_attr)
455+
struct rdma_ah_attr *ah_attr)
456456
{
457457
u32 flow_class;
458458
u16 gid_index;
@@ -560,7 +560,7 @@ EXPORT_SYMBOL(ib_init_ah_from_wc);
560560
struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, const struct ib_wc *wc,
561561
const struct ib_grh *grh, u8 port_num)
562562
{
563-
struct ib_ah_attr ah_attr;
563+
struct rdma_ah_attr ah_attr;
564564
int ret;
565565

566566
ret = ib_init_ah_from_wc(pd->device, port_num, wc, grh, &ah_attr);
@@ -571,15 +571,15 @@ struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, const struct ib_wc *wc,
571571
}
572572
EXPORT_SYMBOL(ib_create_ah_from_wc);
573573

574-
int ib_modify_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr)
574+
int ib_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr)
575575
{
576576
return ah->device->modify_ah ?
577577
ah->device->modify_ah(ah, ah_attr) :
578578
-ENOSYS;
579579
}
580580
EXPORT_SYMBOL(ib_modify_ah);
581581

582-
int ib_query_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr)
582+
int ib_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr)
583583
{
584584
return ah->device->query_ah ?
585585
ah->device->query_ah(ah, ah_attr) :
@@ -1201,7 +1201,7 @@ int ib_modify_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state next_state,
12011201
EXPORT_SYMBOL(ib_modify_qp_is_ok);
12021202

12031203
int ib_resolve_eth_dmac(struct ib_device *device,
1204-
struct ib_ah_attr *ah_attr)
1204+
struct rdma_ah_attr *ah_attr)
12051205
{
12061206
int ret = 0;
12071207

‎drivers/infiniband/hw/bnxt_re/ib_verbs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ int bnxt_re_destroy_ah(struct ib_ah *ib_ah)
524524
}
525525

526526
struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd,
527-
struct ib_ah_attr *ah_attr,
527+
struct rdma_ah_attr *ah_attr,
528528
struct ib_udata *udata)
529529
{
530530
struct bnxt_re_pd *pd = container_of(ib_pd, struct bnxt_re_pd, ib_pd);
@@ -634,12 +634,12 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd,
634634
return ERR_PTR(rc);
635635
}
636636

637-
int bnxt_re_modify_ah(struct ib_ah *ib_ah, struct ib_ah_attr *ah_attr)
637+
int bnxt_re_modify_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr)
638638
{
639639
return 0;
640640
}
641641

642-
int bnxt_re_query_ah(struct ib_ah *ib_ah, struct ib_ah_attr *ah_attr)
642+
int bnxt_re_query_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr)
643643
{
644644
struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);
645645

‎drivers/infiniband/hw/bnxt_re/ib_verbs.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ struct ib_pd *bnxt_re_alloc_pd(struct ib_device *ibdev,
150150
struct ib_udata *udata);
151151
int bnxt_re_dealloc_pd(struct ib_pd *pd);
152152
struct ib_ah *bnxt_re_create_ah(struct ib_pd *pd,
153-
struct ib_ah_attr *ah_attr,
153+
struct rdma_ah_attr *ah_attr,
154154
struct ib_udata *udata);
155-
int bnxt_re_modify_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr);
156-
int bnxt_re_query_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr);
155+
int bnxt_re_modify_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);
156+
int bnxt_re_query_ah(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);
157157
int bnxt_re_destroy_ah(struct ib_ah *ah);
158158
struct ib_qp *bnxt_re_create_qp(struct ib_pd *pd,
159159
struct ib_qp_init_attr *qp_init_attr,

‎drivers/infiniband/hw/cxgb3/iwch_provider.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
#include "common.h"
6363

6464
static struct ib_ah *iwch_ah_create(struct ib_pd *pd,
65-
struct ib_ah_attr *ah_attr,
65+
struct rdma_ah_attr *ah_attr,
6666
struct ib_udata *udata)
6767
{
6868
return ERR_PTR(-ENOSYS);

‎drivers/infiniband/hw/cxgb4/provider.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ module_param(fastreg_support, int, 0644);
5959
MODULE_PARM_DESC(fastreg_support, "Advertise fastreg support (default=1)");
6060

6161
static struct ib_ah *c4iw_ah_create(struct ib_pd *pd,
62-
struct ib_ah_attr *ah_attr,
62+
struct rdma_ah_attr *ah_attr,
6363
struct ib_udata *udata)
6464

6565
{

‎drivers/infiniband/hw/hfi1/ud.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ static void ud_loopback(struct rvt_qp *sqp, struct rvt_swqe *swqe)
6868
struct hfi1_ibport *ibp = to_iport(sqp->ibqp.device, sqp->port_num);
6969
struct hfi1_pportdata *ppd;
7070
struct rvt_qp *qp;
71-
struct ib_ah_attr *ah_attr;
71+
struct rdma_ah_attr *ah_attr;
7272
unsigned long flags;
7373
struct rvt_sge_state ssge;
7474
struct rvt_sge *sge;
@@ -272,7 +272,7 @@ int hfi1_make_ud_req(struct rvt_qp *qp, struct hfi1_pkt_state *ps)
272272
{
273273
struct hfi1_qp_priv *priv = qp->priv;
274274
struct ib_other_headers *ohdr;
275-
struct ib_ah_attr *ah_attr;
275+
struct rdma_ah_attr *ah_attr;
276276
struct hfi1_pportdata *ppd;
277277
struct hfi1_ibport *ibp;
278278
struct rvt_swqe *wqe;

‎drivers/infiniband/hw/hfi1/verbs.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,14 +1459,14 @@ static int hfi1_get_guid_be(struct rvt_dev_info *rdi, struct rvt_ibport *rvp,
14591459
/*
14601460
* convert ah port,sl to sc
14611461
*/
1462-
u8 ah_to_sc(struct ib_device *ibdev, struct ib_ah_attr *ah)
1462+
u8 ah_to_sc(struct ib_device *ibdev, struct rdma_ah_attr *ah)
14631463
{
14641464
struct hfi1_ibport *ibp = to_iport(ibdev, ah->port_num);
14651465

14661466
return ibp->sl_to_sc[ah->sl];
14671467
}
14681468

1469-
static int hfi1_check_ah(struct ib_device *ibdev, struct ib_ah_attr *ah_attr)
1469+
static int hfi1_check_ah(struct ib_device *ibdev, struct rdma_ah_attr *ah_attr)
14701470
{
14711471
struct hfi1_ibport *ibp;
14721472
struct hfi1_pportdata *ppd;
@@ -1484,7 +1484,7 @@ static int hfi1_check_ah(struct ib_device *ibdev, struct ib_ah_attr *ah_attr)
14841484
}
14851485

14861486
static void hfi1_notify_new_ah(struct ib_device *ibdev,
1487-
struct ib_ah_attr *ah_attr,
1487+
struct rdma_ah_attr *ah_attr,
14881488
struct rvt_ah *ah)
14891489
{
14901490
struct hfi1_ibport *ibp;
@@ -1508,7 +1508,7 @@ static void hfi1_notify_new_ah(struct ib_device *ibdev,
15081508

15091509
struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid)
15101510
{
1511-
struct ib_ah_attr attr;
1511+
struct rdma_ah_attr attr;
15121512
struct ib_ah *ah = ERR_PTR(-EINVAL);
15131513
struct rvt_qp *qp0;
15141514

‎drivers/infiniband/hw/hfi1/verbs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ void hfi1_rc_hdrerr(
308308
u32 rcv_flags,
309309
struct rvt_qp *qp);
310310

311-
u8 ah_to_sc(struct ib_device *ibdev, struct ib_ah_attr *ah_attr);
311+
u8 ah_to_sc(struct ib_device *ibdev, struct rdma_ah_attr *ah_attr);
312312

313313
struct ib_ah *hfi1_create_qp0_ah(struct hfi1_ibport *ibp, u16 dlid);
314314

‎drivers/infiniband/hw/hns/hns_roce_ah.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
#define HNS_ROCE_VLAN_SL_BIT_MASK 7
4040
#define HNS_ROCE_VLAN_SL_SHIFT 13
4141

42-
struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *ah_attr,
42+
struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd,
43+
struct rdma_ah_attr *ah_attr,
4344
struct ib_udata *udata)
4445
{
4546
struct hns_roce_dev *hr_dev = to_hr_dev(ibpd->device);
@@ -98,7 +99,7 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd, struct ib_ah_attr *ah_attr,
9899
return &ah->ibah;
99100
}
100101

101-
int hns_roce_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr)
102+
int hns_roce_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr)
102103
{
103104
struct hns_roce_ah *ah = to_hr_ah(ibah);
104105

‎drivers/infiniband/hw/hns/hns_roce_device.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,9 +687,10 @@ void hns_roce_bitmap_free_range(struct hns_roce_bitmap *bitmap,
687687
unsigned long obj, int cnt,
688688
int rr);
689689

690-
struct ib_ah *hns_roce_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
690+
struct ib_ah *hns_roce_create_ah(struct ib_pd *pd,
691+
struct rdma_ah_attr *ah_attr,
691692
struct ib_udata *udata);
692-
int hns_roce_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr);
693+
int hns_roce_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr);
693694
int hns_roce_destroy_ah(struct ib_ah *ah);
694695

695696
struct ib_pd *hns_roce_alloc_pd(struct ib_device *ib_dev,

‎drivers/infiniband/hw/i40iw/i40iw_verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2696,7 +2696,7 @@ static int i40iw_query_pkey(struct ib_device *ibdev,
26962696
* @ah_attr: address handle attributes
26972697
*/
26982698
static struct ib_ah *i40iw_create_ah(struct ib_pd *ibpd,
2699-
struct ib_ah_attr *attr,
2699+
struct rdma_ah_attr *attr,
27002700
struct ib_udata *udata)
27012701

27022702
{

‎drivers/infiniband/hw/mlx4/ah.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040

4141
#include "mlx4_ib.h"
4242

43-
static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
43+
static struct ib_ah *create_ib_ah(struct ib_pd *pd,
44+
struct rdma_ah_attr *ah_attr,
4445
struct mlx4_ib_ah *ah)
4546
{
4647
struct mlx4_dev *dev = to_mdev(pd->device)->dev;
@@ -69,7 +70,8 @@ static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
6970
return &ah->ibah;
7071
}
7172

72-
static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
73+
static struct ib_ah *create_iboe_ah(struct ib_pd *pd,
74+
struct rdma_ah_attr *ah_attr,
7375
struct mlx4_ib_ah *ah)
7476
{
7577
struct mlx4_ib_dev *ibdev = to_mdev(pd->device);
@@ -129,7 +131,7 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr
129131
return &ah->ibah;
130132
}
131133

132-
struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
134+
struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct rdma_ah_attr *ah_attr,
133135
struct ib_udata *udata)
134136

135137
{
@@ -163,7 +165,7 @@ struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr,
163165
return create_ib_ah(pd, ah_attr, ah); /* never fails */
164166
}
165167

166-
int mlx4_ib_query_ah(struct ib_ah *ibah, struct ib_ah_attr *ah_attr)
168+
int mlx4_ib_query_ah(struct ib_ah *ibah, struct rdma_ah_attr *ah_attr)
167169
{
168170
struct mlx4_ib_ah *ah = to_mah(ibah);
169171
enum rdma_link_layer ll;

‎drivers/infiniband/hw/mlx4/mad.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ int mlx4_MAD_IFC(struct mlx4_ib_dev *dev, int mad_ifc_flags,
189189
static void update_sm_ah(struct mlx4_ib_dev *dev, u8 port_num, u16 lid, u8 sl)
190190
{
191191
struct ib_ah *new_ah;
192-
struct ib_ah_attr ah_attr;
192+
struct rdma_ah_attr ah_attr;
193193
unsigned long flags;
194194

195195
if (!dev->send_agent[port_num - 1][0])
@@ -509,7 +509,7 @@ int mlx4_ib_send_to_slave(struct mlx4_ib_dev *dev, int slave, u8 port,
509509
struct mlx4_ib_demux_pv_ctx *tun_ctx;
510510
struct mlx4_ib_demux_pv_qp *tun_qp;
511511
struct mlx4_rcv_tunnel_mad *tun_mad;
512-
struct ib_ah_attr attr;
512+
struct rdma_ah_attr attr;
513513
struct ib_ah *ah;
514514
struct ib_qp *src_qp = NULL;
515515
unsigned tun_tx_ix = 0;
@@ -1352,7 +1352,7 @@ static int is_proxy_qp0(struct mlx4_ib_dev *dev, int qpn, int slave)
13521352

13531353
int mlx4_ib_send_to_wire(struct mlx4_ib_dev *dev, int slave, u8 port,
13541354
enum ib_qp_type dest_qpt, u16 pkey_index,
1355-
u32 remote_qpn, u32 qkey, struct ib_ah_attr *attr,
1355+
u32 remote_qpn, u32 qkey, struct rdma_ah_attr *attr,
13561356
u8 *s_mac, u16 vlan_id, struct ib_mad *mad)
13571357
{
13581358
struct ib_sge list;
@@ -1467,7 +1467,7 @@ static int get_slave_base_gid_ix(struct mlx4_ib_dev *dev, int slave, int port)
14671467
}
14681468

14691469
static void fill_in_real_sgid_index(struct mlx4_ib_dev *dev, int slave, int port,
1470-
struct ib_ah_attr *ah_attr)
1470+
struct rdma_ah_attr *ah_attr)
14711471
{
14721472
if (rdma_port_get_link_layer(&dev->ib_dev, port) == IB_LINK_LAYER_INFINIBAND)
14731473
ah_attr->grh.sgid_index = slave;
@@ -1482,7 +1482,7 @@ static void mlx4_ib_multiplex_mad(struct mlx4_ib_demux_pv_ctx *ctx, struct ib_wc
14821482
int wr_ix = wc->wr_id & (MLX4_NUM_TUNNEL_BUFS - 1);
14831483
struct mlx4_tunnel_mad *tunnel = tun_qp->ring[wr_ix].addr;
14841484
struct mlx4_ib_ah ah;
1485-
struct ib_ah_attr ah_attr;
1485+
struct rdma_ah_attr ah_attr;
14861486
u8 *slave_id;
14871487
int slave;
14881488
int port;

0 commit comments

Comments
 (0)