Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6002d56 authored by Devesh Sharma's avatar Devesh Sharma Committed by Doug Ledford
Browse files

RDMA/ocrdma: Fix vlan-id assignment in qp parameters 



vlan-id is wrongly getting as 0 when PFC is enabled.
Set vlan-id configured by user in QP parameters.
In case vlan interface is not used, flash a warning to
user to configure vlan and assign vlan-id as 0 in qp params.

Fixes: dbf727de ('IB/core: Use GID table in AH creation and dmac resolution')
Cc: Matan Barak <matanb@mellanox.com>
Signed-off-by: default avatarDevesh Sharma <devesh.sharma@avagotech.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent df417667

drivers/infiniband/hw/ocrdma/ocrdma_hw.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -2515,9 +2515,10 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp, 
	ocrdma_cpu_to_le32(&cmd->params.sgid[0], sizeof(cmd->params.sgid));

	ocrdma_cpu_to_le32(&cmd->params.sgid[0], sizeof(cmd->params.sgid));

	cmd->params.vlan_dmac_b4_to_b5 = mac_addr[4] | (mac_addr[5] << 8);

	cmd->params.vlan_dmac_b4_to_b5 = mac_addr[4] | (mac_addr[5] << 8);





	if (vlan_id < 0x1000) {

	if (vlan_id == 0xFFFF)

		if (dev->pfc_state) {

		vlan_id = 0;

		vlan_id = 0;

	if (vlan_id || dev->pfc_state) {

		if (!vlan_id) {

			pr_err("ocrdma%d:Using VLAN with PFC is recommended\n",

			pr_err("ocrdma%d:Using VLAN with PFC is recommended\n",

			       dev->id);

			       dev->id);

			pr_err("ocrdma%d:Using VLAN 0 for this connection\n",

			pr_err("ocrdma%d:Using VLAN 0 for this connection\n",