Commit 1e584739 authored by Shay Agroskin's avatar Shay Agroskin Committed by Jakub Kicinski
Browse files

net: ena: fix coding style nits 



This commit fixes two nits, but it does not generate any change to binary
because of the optimization of gcc.

  - use `count` instead of `channels->combined_count`
  - change return type from `int` to `bool`

Also add spaces and change macro order in OR assignment to make the code
easier to read.

Signed-off-by: default avatarSameeh Jubran <sameehj@amazon.com>
Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.co.jp>
Signed-off-by: default avatarShay Agroskin <shayagr@amazon.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e9548fdf

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

+3 −2
Original line number Diff line number Diff line
@@ -578,6 +578,7 @@ int ena_com_rx_pkt(struct ena_com_io_cq *io_cq, 
	ena_com_rx_set_flags(io_cq, ena_rx_ctx, cdesc);



	ena_rx_ctx->descs = nb_hw_desc;



	return 0;

}
@@ -602,8 +603,8 @@ int ena_com_add_single_rx_desc(struct ena_com_io_sq *io_sq, 


	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;

		     ENA_ETH_IO_RX_DESC_COMP_REQ_MASK |

		     (io_sq->phase & ENA_ETH_IO_RX_DESC_PHASE_MASK);



	desc->req_id = req_id;

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

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static int ena_set_channels(struct net_device *netdev, 
	/* The check for max value is already done in ethtool */

	if (count < ENA_MIN_NUM_IO_QUEUES ||

	    (ena_xdp_present(adapter) &&

	    !ena_xdp_legal_queue_count(adapter, channels->combined_count)))

	    !ena_xdp_legal_queue_count(adapter, count)))

		return -EINVAL;



	return ena_update_queue_count(adapter, count);

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

+2 −2
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static inline bool ena_xdp_present_ring(struct ena_ring *ring) 
	return !!ring->xdp_bpf_prog;

}



static inline int ena_xdp_legal_queue_count(struct ena_adapter *adapter,

static inline bool ena_xdp_legal_queue_count(struct ena_adapter *adapter,

					     u32 queues)

{

	return 2 * queues <= adapter->max_num_io_queues;