aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>2018-08-09 09:28:53 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2018-08-23 12:46:17 -0400
commit5ab522443bd1dafa9e32d6f4b029128efda072de (patch)
tree2ec3d21e4b3b57cedaeb5b5ca192ecf25882a916
parent6efa6239e7f8777dccddcebb643e6d9a0304bf43 (diff)
ice: Cleanup magic number
Use define for the unit size shift of the Rx LAN context descriptor base address instead of the magic number 7. Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by: Tony Brelinski <tonyx.brelinski@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h1
-rw-r--r--drivers/net/ethernet/intel/ice/ice_main.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
index d23a91665b46..068dbc740b76 100644
--- a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
+++ b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
@@ -265,6 +265,7 @@ enum ice_rx_flex_desc_status_error_0_bits {
265struct ice_rlan_ctx { 265struct ice_rlan_ctx {
266 u16 head; 266 u16 head;
267 u16 cpuid; /* bigger than needed, see above for reason */ 267 u16 cpuid; /* bigger than needed, see above for reason */
268#define ICE_RLAN_BASE_S 7
268 u64 base; 269 u64 base;
269 u16 qlen; 270 u16 qlen;
270#define ICE_RLAN_CTX_DBUF_S 7 271#define ICE_RLAN_CTX_DBUF_S 7
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 186e764a469a..7d65e0ed3588 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3983,7 +3983,7 @@ static int ice_setup_rx_ctx(struct ice_ring *ring)
3983 /* clear the context structure first */ 3983 /* clear the context structure first */
3984 memset(&rlan_ctx, 0, sizeof(rlan_ctx)); 3984 memset(&rlan_ctx, 0, sizeof(rlan_ctx));
3985 3985
3986 rlan_ctx.base = ring->dma >> 7; 3986 rlan_ctx.base = ring->dma >> ICE_RLAN_BASE_S;
3987 3987
3988 rlan_ctx.qlen = ring->count; 3988 rlan_ctx.qlen = ring->count;
3989 3989