microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

qed: Do not advertise DCBX_LLD_MANAGED capability. 

Do not advertise DCBX_LLD_MANAGED capability i.e., do not allow
external agent to manage the dcbx/lldp negotiation. MFW acts as lldp agent
for qed* devices, and no other lldp agent is allowed to coexist with mfw.

Also updated a debug print, to not to display the redundant info.

Fixes: a1d8d8a51 ("qed: Add dcbnl support.")
Signed-off-by: Sudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
Signed-off-by: Michal Kalderon <Michal.Kalderon@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sudarsana Reddy Kalluru 2018-06-18 21:58:02 -07:00 коммит произвёл David S. Miller
Родитель 3935a70968
Коммит ff54d5cd9e
1 изменённых файлов: 4 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
Просмотреть файл

@ -255,9 +255,8 @@ qed_dcbx_get_app_protocol_type(struct qed_hwfn *p_hwfn,
*type = DCBX_PROTOCOL_ROCE_V2; *type = DCBX_PROTOCOL_ROCE_V2;
} else { } else {
*type = DCBX_MAX_PROTOCOL_TYPE; *type = DCBX_MAX_PROTOCOL_TYPE;
DP_ERR(p_hwfn, DP_ERR(p_hwfn, "No action required, App TLV entry = 0x%x\n",
"No action required, App TLV id = 0x%x app_prio_bitmap = 0x%x\n", app_prio_bitmap);
id, app_prio_bitmap);
return false; return false;
} }
@ -1479,8 +1478,8 @@ static u8 qed_dcbnl_getcap(struct qed_dev *cdev, int capid, u8 *cap)
*cap = 0x80; *cap = 0x80;
break; break;
case DCB_CAP_ATTR_DCBX: case DCB_CAP_ATTR_DCBX:
*cap = (DCB_CAP_DCBX_LLD_MANAGED | DCB_CAP_DCBX_VER_CEE | *cap = (DCB_CAP_DCBX_VER_CEE | DCB_CAP_DCBX_VER_IEEE |
DCB_CAP_DCBX_VER_IEEE | DCB_CAP_DCBX_STATIC); DCB_CAP_DCBX_STATIC);
break; break;
default: default:
*cap = false; *cap = false;
@ -1548,8 +1547,6 @@ static u8 qed_dcbnl_getdcbx(struct qed_dev *cdev)
if (!dcbx_info) if (!dcbx_info)
return 0; return 0;
if (dcbx_info->operational.enabled)
mode |= DCB_CAP_DCBX_LLD_MANAGED;
if (dcbx_info->operational.ieee) if (dcbx_info->operational.ieee)
mode |= DCB_CAP_DCBX_VER_IEEE; mode |= DCB_CAP_DCBX_VER_IEEE;
if (dcbx_info->operational.cee) if (dcbx_info->operational.cee)