diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2016-08-13 00:16:45 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2016-08-13 00:16:45 -0400 |
| commit | 14d54e3b33d8c06ad301a8bbac6e0611c2d68f3f (patch) | |
| tree | 9861ef237c654a37efdb3c22f3aad98b03587116 /drivers/infiniband | |
| parent | cf3a38958bb4b88e877e89b7e323d1f26cd35b46 (diff) | |
| parent | 0ac0a856d986c1ab240753479f5e50fdfab82b14 (diff) | |
| download | linux-rt-14d54e3b33d8c06ad301a8bbac6e0611c2d68f3f.tar.gz | |
Merge tag 'v3.18.37' into v3.18-rt
Linux 3.18.37
Conflicts:
mm/swap.c
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/ah.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c index e65ee1947279..b33fa45a13cc 100644 --- a/drivers/infiniband/hw/mlx4/ah.c +++ b/drivers/infiniband/hw/mlx4/ah.c @@ -46,6 +46,7 @@ static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr, ah->av.ib.port_pd = cpu_to_be32(to_mpd(pd)->pdn | (ah_attr->port_num << 24)); ah->av.ib.g_slid = ah_attr->src_path_bits; + ah->av.ib.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28); if (ah_attr->ah_flags & IB_AH_GRH) { ah->av.ib.g_slid |= 0x80; ah->av.ib.gid_index = ah_attr->grh.sgid_index; @@ -63,7 +64,6 @@ static struct ib_ah *create_ib_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr, !(1 << ah->av.ib.stat_rate & dev->caps.stat_rate_support)) --ah->av.ib.stat_rate; } - ah->av.ib.sl_tclass_flowlabel = cpu_to_be32(ah_attr->sl << 28); return &ah->ibah; } |