diff options
| author | Robert Richter <rrichter@cavium.com> | 2015-06-02 21:00:18 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-02 22:49:26 +0300 |
| commit | d768b678a8d9c572ad3c2c6ba71d9e7029b867a2 (patch) | |
| tree | e8c5f6e3226756e0e69c1001bb8090f14e4ca22b /drivers/net/ethernet/cavium/thunder/thunder_bgx.h | |
| parent | dda922c831d1661c11a3ae1051b7160236f6ffb0 (diff) | |
| download | linux-d768b678a8d9c572ad3c2c6ba71d9e7029b867a2.tar.xz | |
net: thunderx: Cleanup duplicate NODE_ID macros, add nic_get_node_id()
There are duplicate NODE_ID macro definitions. Move all of them to
nic.h for usage in nic and bgx driver and introduce nic_get_node_id()
helper function.
This patch also fixes 64bit mask which should have been ULL by
reworking the node calculation.
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/thunder/thunder_bgx.h')
| -rw-r--r-- | drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h index 9d91ce44f8d7..f9e2170c488a 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h @@ -20,9 +20,6 @@ #define MAX_LMAC (MAX_BGX_PER_CN88XX * MAX_LMAC_PER_BGX) -#define NODE_ID_MASK 0x300000000000 -#define NODE_ID(x) ((x & NODE_ID_MASK) >> 44) - /* Registers */ #define BGX_CMRX_CFG 0x00 #define CMR_PKT_TX_EN BIT_ULL(13) |