net: ena: Reduce holes in ena_com structures

This patch makes two changes in order to fill holes and
reduce ther overall size of the structures ena_com_dev
and ena_com_rx_ctx.

Signed-off-by: Shahar Itzko <itzko@amazon.com>
Signed-off-by: David Arinzon <darinzon@amazon.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240512134637.25299-3-darinzon@amazon.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/amazon/ena/ena_com.h b/drivers/net/ethernet/amazon/ena/ena_com.h
index fea57eb8e58b63d90a0bb2d3e53d96dec6dee669..fdae0cc9ce9b8436dcc1242aee0163bf545430f7 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_com.h
+++ b/drivers/net/ethernet/amazon/ena/ena_com.h
@@ -305,6 +305,8 @@ struct ena_com_dev {
        u16 stats_func; /* Selected function for extended statistic dump */
        u16 stats_queue; /* Selected queue for extended statistic dump */
 
+       u32 ena_min_poll_delay_us;
+
        struct ena_com_mmio_read mmio_read;
 
        struct ena_rss rss;
@@ -325,8 +327,6 @@ struct ena_com_dev {
        struct ena_intr_moder_entry *intr_moder_tbl;
 
        struct ena_com_llq_info llq_info;
-
-       u32 ena_min_poll_delay_us;
 };
 
 struct ena_com_dev_get_features_ctx {

diff --git a/drivers/net/ethernet/amazon/ena/ena_eth_com.h b/drivers/net/ethernet/amazon/ena/ena_eth_com.h
index 72b019758caafc04b1aae8e821a03a649d94010c..449bc4960cccab3cbf3eab4662ff2ba084af81cb 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_eth_com.h
+++ b/drivers/net/ethernet/amazon/ena/ena_eth_com.h
@@ -47,7 +47,7 @@ struct ena_com_rx_ctx {
        bool frag;
        u32 hash;
        u16 descs;
-       int max_bufs;
+       u16 max_bufs;
        u8 pkt_offset;
 };