From: Qi Zhang <qi.z.zhang@intel.com>
To: jing.d.chen@intel.com
Cc: helin.zhang@intel.com, dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>
Subject: [dpdk-dev] [PATCH 16/17] net/fm10k/base: replace macros
Date: Thu, 2 Mar 2017 22:17:26 -0500 [thread overview]
Message-ID: <20170303031727.461-17-qi.z.zhang@intel.com> (raw)
In-Reply-To: <20170303031727.461-1-qi.z.zhang@intel.com>
Other shared code bases are planning on using
IS_MULTICAST_ETHER_ADDR and friends without leaving the driver
name in the macro.
Remove reference to FM10K here so that we can re-use the specific
compat flags from Linux.
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/fm10k/base/fm10k_pf.c | 10 +++++-----
drivers/net/fm10k/base/fm10k_type.h | 14 +++++++-------
drivers/net/fm10k/base/fm10k_vf.c | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/net/fm10k/base/fm10k_pf.c b/drivers/net/fm10k/base/fm10k_pf.c
index 5b1098e..db5f491 100644
--- a/drivers/net/fm10k/base/fm10k_pf.c
+++ b/drivers/net/fm10k/base/fm10k_pf.c
@@ -411,7 +411,7 @@ STATIC s32 fm10k_update_uc_addr_pf(struct fm10k_hw *hw, u16 glort,
DEBUGFUNC("fm10k_update_uc_addr_pf");
/* verify MAC address is valid */
- if (!FM10K_IS_VALID_ETHER_ADDR(mac))
+ if (!IS_VALID_ETHER_ADDR(mac))
return FM10K_ERR_PARAM;
return fm10k_update_xc_addr_pf(hw, glort, mac, vid, add, flags);
@@ -434,7 +434,7 @@ STATIC s32 fm10k_update_mc_addr_pf(struct fm10k_hw *hw, u16 glort,
DEBUGFUNC("fm10k_update_mc_addr_pf");
/* verify multicast address is valid */
- if (!FM10K_IS_MULTICAST_ETHER_ADDR(mac))
+ if (!IS_MULTICAST_ETHER_ADDR(mac))
return FM10K_ERR_PARAM;
return fm10k_update_xc_addr_pf(hw, glort, mac, vid, add, 0);
@@ -970,7 +970,7 @@ STATIC s32 fm10k_iov_assign_default_mac_vlan_pf(struct fm10k_hw *hw,
}
/* Update base address registers to contain MAC address */
- if (FM10K_IS_VALID_ETHER_ADDR(vf_info->mac)) {
+ if (IS_VALID_ETHER_ADDR(vf_info->mac)) {
tdbal = (((u32)vf_info->mac[3]) << 24) |
(((u32)vf_info->mac[4]) << 16) |
(((u32)vf_info->mac[5]) << 8);
@@ -1100,7 +1100,7 @@ STATIC s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw,
FM10K_WRITE_REG(hw, FM10K_MRQC(vf_info->vsi), 0);
/* Update base address registers to contain MAC address */
- if (FM10K_IS_VALID_ETHER_ADDR(vf_info->mac)) {
+ if (IS_VALID_ETHER_ADDR(vf_info->mac)) {
tdbal = (((u32)vf_info->mac[3]) << 24) |
(((u32)vf_info->mac[4]) << 16) |
(((u32)vf_info->mac[5]) << 8);
@@ -1326,7 +1326,7 @@ s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results,
return err;
/* block attempts to set MAC for a locked device */
- if (FM10K_IS_VALID_ETHER_ADDR(vf_info->mac) &&
+ if (IS_VALID_ETHER_ADDR(vf_info->mac) &&
memcmp(mac, vf_info->mac, ETH_ALEN))
return FM10K_ERR_PARAM;
diff --git a/drivers/net/fm10k/base/fm10k_type.h b/drivers/net/fm10k/base/fm10k_type.h
index 931633d..1ae1644 100644
--- a/drivers/net/fm10k/base/fm10k_type.h
+++ b/drivers/net/fm10k/base/fm10k_type.h
@@ -447,20 +447,20 @@ struct fm10k_hw;
#define ETH_ALEN 6
#endif /* ETH_ALEN */
-#ifndef FM10K_IS_ZERO_ETHER_ADDR
+#ifndef IS_ZERO_ETHER_ADDR
/* make certain address is not 0 */
-#define FM10K_IS_ZERO_ETHER_ADDR(addr) \
+#define IS_ZERO_ETHER_ADDR(addr) \
(!((addr)[0] | (addr)[1] | (addr)[2] | (addr)[3] | (addr)[4] | (addr)[5]))
#endif
-#ifndef FM10K_IS_MULTICAST_ETHER_ADDR
-#define FM10K_IS_MULTICAST_ETHER_ADDR(addr) ((addr)[0] & 0x1)
+#ifndef IS_MULTICAST_ETHER_ADDR
+#define IS_MULTICAST_ETHER_ADDR(addr) ((addr)[0] & 0x1)
#endif
-#ifndef FM10K_IS_VALID_ETHER_ADDR
+#ifndef IS_VALID_ETHER_ADDR
/* make certain address is not multicast or 0 */
-#define FM10K_IS_VALID_ETHER_ADDR(addr) \
-(!FM10K_IS_MULTICAST_ETHER_ADDR(addr) && !FM10K_IS_ZERO_ETHER_ADDR(addr))
+#define IS_VALID_ETHER_ADDR(addr) \
+(!IS_MULTICAST_ETHER_ADDR(addr) && !IS_ZERO_ETHER_ADDR(addr))
#endif
enum fm10k_int_source {
diff --git a/drivers/net/fm10k/base/fm10k_vf.c b/drivers/net/fm10k/base/fm10k_vf.c
index 71bacd0..bd44977 100644
--- a/drivers/net/fm10k/base/fm10k_vf.c
+++ b/drivers/net/fm10k/base/fm10k_vf.c
@@ -53,7 +53,7 @@ STATIC s32 fm10k_stop_hw_vf(struct fm10k_hw *hw)
return err;
/* If permanent address is set then we need to restore it */
- if (FM10K_IS_VALID_ETHER_ADDR(perm_addr)) {
+ if (IS_VALID_ETHER_ADDR(perm_addr)) {
bal = (((u32)perm_addr[3]) << 24) |
(((u32)perm_addr[4]) << 16) |
(((u32)perm_addr[5]) << 8);
@@ -341,11 +341,11 @@ STATIC s32 fm10k_update_uc_addr_vf(struct fm10k_hw *hw, u16 glort,
return FM10K_ERR_PARAM;
/* verify MAC address is valid */
- if (!FM10K_IS_VALID_ETHER_ADDR(mac))
+ if (!IS_VALID_ETHER_ADDR(mac))
return FM10K_ERR_PARAM;
/* verify we are not locked down on the MAC address */
- if (FM10K_IS_VALID_ETHER_ADDR(hw->mac.perm_addr) &&
+ if (IS_VALID_ETHER_ADDR(hw->mac.perm_addr) &&
memcmp(hw->mac.perm_addr, mac, ETH_ALEN))
return FM10K_ERR_PARAM;
@@ -387,7 +387,7 @@ STATIC s32 fm10k_update_mc_addr_vf(struct fm10k_hw *hw, u16 glort,
return FM10K_ERR_PARAM;
/* verify multicast address is valid */
- if (!FM10K_IS_MULTICAST_ETHER_ADDR(mac))
+ if (!IS_MULTICAST_ETHER_ADDR(mac))
return FM10K_ERR_PARAM;
/* add bit to notify us if this is a set or clear operation */
--
2.9.3
next prev parent reply other threads:[~2017-03-03 2:26 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-03 3:17 [dpdk-dev] [PATCH 00/17] net/fm10k: update base code Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 01/17] net/fm10k/base: add a flag to indicate VF trust mode Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 02/17] net/fm10k/base: reset multicaset mode when deleting lport Qi Zhang
2017-03-05 11:41 ` Ferruh Yigit
2017-03-03 3:17 ` [dpdk-dev] [PATCH 03/17] net/fm10k/base: expose macros needed by DPDK Qi Zhang
2017-03-05 11:41 ` Ferruh Yigit
2017-03-03 3:17 ` [dpdk-dev] [PATCH 04/17] net/fm10k/base: add error code Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 05/17] net/fm10k/base: clean up the logic Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 06/17] net/fm10k/base: add new item to lport msg attr Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 07/17] net/fm10k/base: use 8 bit notation instead of 10bit notation Qi Zhang
2017-03-05 11:42 ` Ferruh Yigit
2017-03-03 3:17 ` [dpdk-dev] [PATCH 08/17] net/fm10k/base: use different name for override bit Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 09/17] net/fm10k/base: update comment regarding reserved bits check Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 10/17] net/fm10k/base: improve VF's multi-bit VLAN update requests Qi Zhang
2017-03-05 11:42 ` Ferruh Yigit
2017-03-03 3:17 ` [dpdk-dev] [PATCH 11/17] net/fm10k/base: enable lport map request Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 12/17] net/fm10k/base: add macros for global interrupt Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 13/17] net/fm10k/base: don't stop reset Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 14/17] net/fm10k/base: add macro for geneve tunnel offload Qi Zhang
2017-03-03 3:17 ` [dpdk-dev] [PATCH 15/17] net/fm10k/base: improve re-map queues handle Qi Zhang
2017-03-03 3:17 ` Qi Zhang [this message]
2017-03-03 3:17 ` [dpdk-dev] [PATCH 17/17] net/fm10k/base: equest reset when mbx->state changes Qi Zhang
2017-03-05 11:42 ` Ferruh Yigit
2017-03-05 11:41 ` [dpdk-dev] [PATCH 00/17] net/fm10k: update base code Ferruh Yigit
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 00/18] " Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 01/18] net/fm10k/base: add a flag to indicate VF trust mode Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 02/18] net/fm10k/base: reset multicast mode when deleting lport Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 03/18] net/fm10k/base: expose macros needed by DPDK Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 04/18] net/fm10k/base: add error code Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 05/18] net/fm10k/base: clean up the logic Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 06/18] net/fm10k/base: add new item to lport msg attr Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 07/18] net/fm10k/base: update comment Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 08/18] net/fm10k/base: use different name for override bit Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 09/18] net/fm10k/base: update comment regarding reserved bits check Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 10/18] net/fm10k/base: improve VF's multi-bit VLAN update requests Qi Zhang
2017-03-08 6:18 ` [dpdk-dev] [PATCH v2 11/18] net/fm10k/base: enable lport map request Qi Zhang
2017-03-08 6:19 ` [dpdk-dev] [PATCH v2 12/18] net/fm10k/base: add macros for global interrupt Qi Zhang
2017-03-08 6:19 ` [dpdk-dev] [PATCH v2 13/18] net/fm10k/base: don't stop reset Qi Zhang
2017-03-08 6:19 ` [dpdk-dev] [PATCH v2 14/18] net/fm10k/base: add macro for geneve tunnel offload Qi Zhang
2017-03-08 6:19 ` [dpdk-dev] [PATCH v2 15/18] net/fm10k/base: improve re-map queues handle Qi Zhang
2017-03-08 6:19 ` [dpdk-dev] [PATCH v2 16/18] net/fm10k/base: replace macros Qi Zhang
2017-03-08 6:19 ` [dpdk-dev] [PATCH v2 17/18] net/fm10k/base: request reset when mbx->state changes Qi Zhang
2017-03-08 6:19 ` [dpdk-dev] [PATCH v2 18/18] net/fm10k/base: add base driver information Qi Zhang
2017-03-09 11:13 ` [dpdk-dev] [PATCH v2 00/18] net/fm10k: update base code Ferruh Yigit
2017-03-10 3:11 ` Zhang, Qi Z
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=20170303031727.461-17-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=jing.d.chen@intel.com \
/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).