[PATCH rdma-next] RDMA/core: Fix find_gid_index to use the proper API to retrieve the vlan ID

[Yuval Basson <ybason@marvell.com>]

When working over a macvlan device which was itself
created over a vlan device, the roce CM traffic should use
the vlan from the lower vlan device, but instead it simply queries
the macvlan device as to whether it is itself a vlan device. 
Since it is not, the roce CM traffic is sent without any vlan, which
causes it not to be accepted by the peer which is running directly
over a vlan device, and will thus only accept roce CM traffic carrying
the vlan.

Fixes: dbf727de7440 ("Use GID table in AH creation and dmac resolution")
Signed-off-by: Ariel Elior <aelior@marvell.com>
Signed-off-by: Yuval Basson <ybason@marvell.com>
---
 drivers/infiniband/core/verbs.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index f974b68..1d2d9be0 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -662,13 +662,13 @@ static bool find_gid_index(const union ib_gid *gid,
 			   void *context)
 {
 	struct find_gid_index_context *ctx = context;
+	u16 vlan_id;
 
 	if (ctx->gid_type != gid_attr->gid_type)
 		return false;
 
-	if ((!!(ctx->vlan_id != 0xffff) == !is_vlan_dev(gid_attr->ndev)) ||
-	    (is_vlan_dev(gid_attr->ndev) &&
-	     vlan_dev_vlan_id(gid_attr->ndev) != ctx->vlan_id))
+	rdma_read_gid_l2_fields(gid_attr, &vlan_id, NULL);
+	if (ctx->vlan_id != vlan_id)
 		return false;
 
 	return true;
-- 
1.8.3.1