diff options
| author | Jason Gunthorpe <jgunthorpe@obsidianresearch.com> | 2016-06-08 17:28:29 -0600 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-07-12 08:46:55 -0400 |
| commit | d0626b2014fa3e18ba476e8fe45b448bcc38a736 (patch) | |
| tree | d490e0a0dd7723607ec7bb686425fa527d4b5e6e /drivers/infiniband | |
| parent | eefeb9a25bfeb73a64fb92c3b7189d34b557dfe0 (diff) | |
| download | linux-stable-d0626b2014fa3e18ba476e8fe45b448bcc38a736.tar.gz linux-stable-d0626b2014fa3e18ba476e8fe45b448bcc38a736.tar.bz2 linux-stable-d0626b2014fa3e18ba476e8fe45b448bcc38a736.zip | |
IB/mlx4: Properly initialize GRH TClass and FlowLabel in AHs
[ Upstream commit 8c5122e45a10a9262f872b53f151a592e870f905 ]
When this code was reworked for IBoE support the order of assignments
for the sl_tclass_flowlabel got flipped around resulting in
TClass & FlowLabel being permanently set to 0 in the packet headers.
This breaks IB routers that rely on these headers, but only affects
kernel users - libmlx4 does this properly for user space.
Cc: stable@vger.kernel.org
Fixes: fa417f7b520e ("IB/mlx4: Add support for IBoE")
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
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; } |