Commit b0ae3ac4 authored by Arthur Kiyanovski's avatar Arthur Kiyanovski Committed by David S. Miller
Browse files

net: ena: cosmetic: minor code changes 



1. Use BIT macro instead of shift operator for code clarity
2. Replace multiple flag assignments to a single assignment of multiple
   flags in ena_com_add_single_rx_desc()
3. Move ENA_HASH_KEY_SIZE from ena_netdev.h to ena_com.h

Signed-off-by: default avatarArthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d0862e0

drivers/net/ethernet/amazon/ena/ena_com.c

+1 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ int ena_com_fill_hash_function(struct ena_com_dev *ena_dev, 
	if (unlikely(rc))

		return rc;



	if (!((1 << func) & get_resp.u.flow_hash_func.supported_func)) {

	if (!(BIT(func) & get_resp.u.flow_hash_func.supported_func)) {

		pr_err("Flow hash function %d isn't supported\n", func);

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/amazon/ena/ena_com.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ 
#define ENA_INTR_INITIAL_RX_INTERVAL_USECS 0

#define ENA_DEFAULT_INTR_DELAY_RESOLUTION 1



#define ENA_HASH_KEY_SIZE 40



#define ENA_HW_HINTS_NO_TIMEOUT	0xFFFF



#define ENA_FEATURE_MAX_QUEUE_EXT_VER 1

drivers/net/ethernet/amazon/ena/ena_eth_com.c

+4 −4
Original line number Diff line number Diff line
@@ -584,10 +584,10 @@ int ena_com_add_single_rx_desc(struct ena_com_io_sq *io_sq, 


	desc->length = ena_buf->len;



	desc->ctrl = ENA_ETH_IO_RX_DESC_FIRST_MASK;

	desc->ctrl |= ENA_ETH_IO_RX_DESC_LAST_MASK;

	desc->ctrl |= io_sq->phase & ENA_ETH_IO_RX_DESC_PHASE_MASK;

	desc->ctrl |= ENA_ETH_IO_RX_DESC_COMP_REQ_MASK;

	desc->ctrl = ENA_ETH_IO_RX_DESC_FIRST_MASK |

		ENA_ETH_IO_RX_DESC_LAST_MASK |

		(io_sq->phase & ENA_ETH_IO_RX_DESC_PHASE_MASK) |

		ENA_ETH_IO_RX_DESC_COMP_REQ_MASK;



	desc->req_id = req_id;

drivers/net/ethernet/amazon/ena/ena_netdev.h

+0 −2
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ 
#define ENA_RX_RSS_TABLE_LOG_SIZE  7

#define ENA_RX_RSS_TABLE_SIZE	(1 << ENA_RX_RSS_TABLE_LOG_SIZE)



#define ENA_HASH_KEY_SIZE	40



/* The number of tx packet completions that will be handled each NAPI poll

 * cycle is ring_size / ENA_TX_POLL_BUDGET_DIVIDER.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE