Synchronize patches, add DFX for UB and NIC, and MAC, and solve some bugs Signed-off-by: veega2022 <zhuweijia@huawei.com>
54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From a170acb3dc9203cd1d9708c9834640df0a916f72 Mon Sep 17 00:00:00 2001
|
|
From: veega <zhuweijia@huawei.com>
|
|
Date: Tue, 16 May 2023 10:39:39 +0800
|
|
Subject: [PATCH] hikptool: delete redundant copyright notices
|
|
|
|
Delete redundant copyright notices in hikp_ub_link.h
|
|
|
|
Signed-off-by: veega <zhuweijia@huawei.com>
|
|
---
|
|
net/ub/ub_link/hikp_ub_link.h | 13 -------------
|
|
tool_lib/tool_lib.h | 2 +-
|
|
2 files changed, 1 insertion(+), 14 deletions(-)
|
|
|
|
diff --git a/net/ub/ub_link/hikp_ub_link.h b/net/ub/ub_link/hikp_ub_link.h
|
|
index 14ee912..7c71cb2 100644
|
|
--- a/net/ub/ub_link/hikp_ub_link.h
|
|
+++ b/net/ub/ub_link/hikp_ub_link.h
|
|
@@ -11,19 +11,6 @@
|
|
* See the Mulan PSL v2 for more details.
|
|
*/
|
|
|
|
-/*
|
|
- * Copyright (c) 2023 Hisilicon Technologies Co., Ltd.
|
|
- * Hikptool is licensed under Mulan PSL v2.
|
|
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
|
|
- * You may obtain a copy of Mulan PSL v2 at:
|
|
- * http://license.coscl.org.cn/MulanPSL2
|
|
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
|
|
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
|
|
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
|
|
- *
|
|
- * See the Mulan PSL v2 for more details.
|
|
- */
|
|
-
|
|
#ifndef HIKP_UB_LINK_H
|
|
#define HIKP_UB_LINK_H
|
|
|
|
diff --git a/tool_lib/tool_lib.h b/tool_lib/tool_lib.h
|
|
index 9766a7e..6548b57 100644
|
|
--- a/tool_lib/tool_lib.h
|
|
+++ b/tool_lib/tool_lib.h
|
|
@@ -18,7 +18,7 @@
|
|
|
|
#define TOOL_NAME "hikptool"
|
|
|
|
-#define TOOL_VER "1.0.15"
|
|
+#define TOOL_VER "1.0.16"
|
|
|
|
#define HI_GET_BITFIELD(value, start, mask) (((value) >> (start)) & (mask))
|
|
#define HI_SET_FIELD(origin, shift, val) ((origin) |= (val) << (shift))
|
|
--
|
|
2.36.1.windows.1
|
|
|