From: Jiawen Wu <jiawenwu@trustnetic.com>
To: netdev@vger.kernel.org, mengyuanlou@net-swift.com
Cc: Jiawen Wu <jiawenwu@trustnetic.com>
Subject: [PATCH net-next v3 3/8] net: txgbe: Move defines into unified file
Date: Fri, 6 Jan 2023 11:38:48 +0800 [thread overview]
Message-ID: <20230106033853.2806007-4-jiawenwu@trustnetic.com> (raw)
In-Reply-To: <20230106033853.2806007-1-jiawenwu@trustnetic.com>
Remove txgbe.h, move defines into txgbe_type.h file.
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
drivers/net/ethernet/wangxun/txgbe/txgbe.h | 23 -------------------
drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 1 -
.../net/ethernet/wangxun/txgbe/txgbe_main.c | 1 -
.../net/ethernet/wangxun/txgbe/txgbe_type.h | 16 +++++++++++++
4 files changed, 16 insertions(+), 25 deletions(-)
delete mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe.h
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe.h b/drivers/net/ethernet/wangxun/txgbe/txgbe.h
deleted file mode 100644
index 629c139926c5..000000000000
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* Copyright (c) 2015 - 2022 Beijing WangXun Technology Co., Ltd. */
-
-#ifndef _TXGBE_H_
-#define _TXGBE_H_
-
-#define TXGBE_MAX_FDIR_INDICES 63
-
-#define TXGBE_MAX_RX_QUEUES (TXGBE_MAX_FDIR_INDICES + 1)
-#define TXGBE_MAX_TX_QUEUES (TXGBE_MAX_FDIR_INDICES + 1)
-
-#define TXGBE_SP_MAX_TX_QUEUES 128
-#define TXGBE_SP_MAX_RX_QUEUES 128
-#define TXGBE_SP_RAR_ENTRIES 128
-#define TXGBE_SP_MC_TBL_SIZE 128
-
-#define TXGBE_MAC_STATE_DEFAULT 0x1
-#define TXGBE_MAC_STATE_MODIFIED 0x2
-#define TXGBE_MAC_STATE_IN_USE 0x4
-
-extern char txgbe_driver_name[];
-
-#endif /* _TXGBE_H_ */
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
index 0536f2059db9..a657b579447c 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c
@@ -12,7 +12,6 @@
#include "../libwx/wx_hw.h"
#include "txgbe_type.h"
#include "txgbe_hw.h"
-#include "txgbe.h"
/**
* txgbe_init_thermal_sensor_thresh - Inits thermal sensor thresholds
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
index 900f0f2be262..96657430fe67 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
@@ -14,7 +14,6 @@
#include "../libwx/wx_hw.h"
#include "txgbe_type.h"
#include "txgbe_hw.h"
-#include "txgbe.h"
char txgbe_driver_name[] = "txgbe";
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
index 0cc333a11cab..c4d22ceeddad 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
@@ -67,6 +67,20 @@
#define TXGBE_PBANUM1_PTR 0x06
#define TXGBE_PBANUM_PTR_GUARD 0xFAFA
+#define TXGBE_MAX_FDIR_INDICES 63
+
+#define TXGBE_MAX_RX_QUEUES (TXGBE_MAX_FDIR_INDICES + 1)
+#define TXGBE_MAX_TX_QUEUES (TXGBE_MAX_FDIR_INDICES + 1)
+
+#define TXGBE_SP_MAX_TX_QUEUES 128
+#define TXGBE_SP_MAX_RX_QUEUES 128
+#define TXGBE_SP_RAR_ENTRIES 128
+#define TXGBE_SP_MC_TBL_SIZE 128
+
+#define TXGBE_MAC_STATE_DEFAULT 0x1
+#define TXGBE_MAC_STATE_MODIFIED 0x2
+#define TXGBE_MAC_STATE_IN_USE 0x4
+
struct txgbe_mac_addr {
u8 addr[ETH_ALEN];
u16 state; /* bitmask */
@@ -85,4 +99,6 @@ struct txgbe_adapter {
char eeprom_id[32];
};
+extern char txgbe_driver_name[];
+
#endif /* _TXGBE_TYPE_H_ */
--
2.27.0
next prev parent reply other threads:[~2023-01-06 3:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-06 3:38 [PATCH net-next v3 0/8] net: wangxun: Adjust code structure Jiawen Wu
2023-01-06 3:38 ` [PATCH net-next v3 1/8] net: txgbe: Remove structure txgbe_hw Jiawen Wu
2023-01-06 3:38 ` [PATCH net-next v3 2/8] net: ngbe: Remove structure ngbe_hw Jiawen Wu
2023-01-06 3:38 ` Jiawen Wu [this message]
2023-01-06 3:38 ` [PATCH net-next v3 4/8] net: ngbe: Move defines into unified file Jiawen Wu
2023-01-06 3:38 ` [PATCH net-next v3 5/8] net: wangxun: Move MAC address handling to libwx Jiawen Wu
2023-01-06 3:38 ` [PATCH net-next v3 6/8] net: wangxun: Rename private structure in libwx Jiawen Wu
2023-01-06 3:38 ` [PATCH net-next v3 7/8] net: txgbe: Remove structure txgbe_adapter Jiawen Wu
2023-01-06 3:38 ` [PATCH net-next v3 8/8] net: ngbe: Remove structure ngbe_adapter Jiawen Wu
2023-01-07 3:50 ` [PATCH net-next v3 0/8] net: wangxun: Adjust code structure patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230106033853.2806007-4-jiawenwu@trustnetic.com \
--to=jiawenwu@trustnetic.com \
--cc=mengyuanlou@net-swift.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).