Unverified Commit 7cea4326 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11788 The ip_notify_sysfs_create function logs are recorded using the netdev_err interface. 

Merge Pull Request from: @cheng-jiaqi888 
 
modify for ICSL.

tool inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/ub-dhcp/issues/IAT9OZ


CVE: NA

----------------------------------------------------------------------
1.Delete redundant spaces from the if_register_ub6 function.
2.The lldpd_get_tlv_name function is returned by querying an array.
3.The static modification is added to ub_dguid.
4.The ip_notify_sysfs_create function logs are recorded using the netdev_err interface.

Signed-off-by: default avatarGe Hu <huge4@huawei.com>
 
Link:https://gitee.com/openeuler/kernel/pulls/11788

 

Reviewed-by: default avatarChunzhi Hu <huchunzhi@huawei.com>
Signed-off-by: default avatarChunzhi Hu <huchunzhi@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 242e6e34 41bf8a12

drivers/net/ub/dev/network_mgmt/ip_notify/ip_notify.c

+6 −6
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
static struct workqueue_struct *ip_notify_wq;

static int initialized;



const u8 ub_dguid[UBL_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF,

static const u8 ub_dguid[UBL_ALEN] = {0xFF, 0xFF, 0xFF, 0xFF,

				      0xFF, 0xFF, 0xFF, 0xFF,

				      0xFF, 0xFF, 0xFF, 0xFF,

				      0xFF, 0xFF, 0x01, 0x02};
@@ -322,14 +322,14 @@ int ip_notify_sysfs_create(struct ub_nm_device *nm_dev) 
	ip_notify_ctx->ip_notify_root = kobject_create_and_add("ip_notify",

							       kobj);

	if (!ip_notify_ctx->ip_notify_root) {

		pr_err("Failed to create ip_notify dir.\n");

		netdev_err(nm_dev->ndev, "Failed to create ip_notify dir.\n");

		return -ENOMEM;

	}



	ret = ip_notify_init_attrs(ip_notify_ctx->ip_notify_root,

				   &ip_notify_ctx->attrs);

	if (ret) {

		pr_err("Failed to init ip notify attrs, ret = %d\n", ret);

		netdev_err(nm_dev->ndev, "Failed to init ip notify attrs, ret = %d\n", ret);

		goto err_ip_notify_init_attrs;

	}