aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Immanuel <vijayi@attalasystems.com>2018-06-12 18:12:05 -0700
committerJason Gunthorpe <jgg@mellanox.com>2018-06-18 13:16:04 -0600
commit92cf36eec2a76d8fe61d439cd2b3ebbf33029477 (patch)
treefad0a25f6e4934ef13bd2e7aeae919f444c74c0e
parentIB/rxe: increase max MR limit (diff)
downloadlinux-dev-92cf36eec2a76d8fe61d439cd2b3ebbf33029477.tar.xz
linux-dev-92cf36eec2a76d8fe61d439cd2b3ebbf33029477.zip
IB/rxe: support for 802.1q VLAN on the listener
Set the vlan flag and vlan_id field in the wc for rdma_listen() to work over VLAN. This is required by ib_init_ah_attr_from_wc() which is called by the CM REQ handler. Signed-off-by: Vijay Immanuel <vijayi@attalasystems.com> Reviewed-by: Yonatan Cohen <yonatanc@mellanox.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
-rw-r--r--drivers/infiniband/sw/rxe/rxe_resp.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/infiniband/sw/rxe/rxe_resp.c b/drivers/infiniband/sw/rxe/rxe_resp.c
index 5b57de30dee4..aa5833318372 100644
--- a/drivers/infiniband/sw/rxe/rxe_resp.c
+++ b/drivers/infiniband/sw/rxe/rxe_resp.c
@@ -884,6 +884,11 @@ static enum resp_states do_complete(struct rxe_qp *qp,
else
wc->network_hdr_type = RDMA_NETWORK_IPV6;
+ if (is_vlan_dev(skb->dev)) {
+ wc->wc_flags |= IB_WC_WITH_VLAN;
+ wc->vlan_id = vlan_dev_vlan_id(skb->dev);
+ }
+
if (pkt->mask & RXE_IMMDT_MASK) {
wc->wc_flags |= IB_WC_WITH_IMM;
wc->ex.imm_data = immdt_imm(pkt);