From: oulijun <oulijun@huawei.com>
Date: Wed, 7 Feb 2018 17:49:28 +0800
Subject: RDMA/hns: Fix a bug with modifying mac address
Patch-mainline: v4.17-rc1
Git-commit: 173bc6be96c733ff7e6418eece9d64d03e7465b3
References: bsc#1104427 FATE#326416
When modifying mac address, it will trigger hns_roce_del_gid
function and can't delete the default gid matched the index
because the attribute of gid is null.
Signed-off-by: Lijun Ou <oulijun@huawei.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
drivers/infiniband/hw/hns/hns_roce_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -100,6 +100,7 @@ static int hns_roce_del_gid(struct ib_de
unsigned int index, void **context)
{
struct hns_roce_dev *hr_dev = to_hr_dev(device);
+ struct ib_gid_attr zattr = { };
union ib_gid zgid = { {0} };
u8 port = port_num - 1;
unsigned long flags;
@@ -110,7 +111,7 @@ static int hns_roce_del_gid(struct ib_de
spin_lock_irqsave(&hr_dev->iboe.lock, flags);
- ret = hr_dev->hw->set_gid(hr_dev, port, index, &zgid, NULL);
+ ret = hr_dev->hw->set_gid(hr_dev, port, index, &zgid, &zattr);
spin_unlock_irqrestore(&hr_dev->iboe.lock, flags);