hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
....@@ -72,7 +72,7 @@
7272 #define MLX4_EN_PAGE_SIZE (1 << MLX4_EN_PAGE_SHIFT)
7373 #define DEF_RX_RINGS 16
7474 #define MAX_RX_RINGS 128
75
-#define MIN_RX_RINGS 4
75
+#define MIN_RX_RINGS 1
7676 #define LOG_TXBB_SIZE 6
7777 #define TXBB_SIZE BIT(LOG_TXBB_SIZE)
7878 #define HEADROOM (2048 / TXBB_SIZE + 1)
....@@ -608,8 +608,6 @@
608608 struct work_struct linkstate_task;
609609 struct delayed_work stats_task;
610610 struct delayed_work service_task;
611
- struct work_struct vxlan_add_task;
612
- struct work_struct vxlan_del_task;
613611 struct mlx4_en_perf_stats pstats;
614612 struct mlx4_en_pkt_stats pkstats;
615613 struct mlx4_en_counter_stats pf_stats;
....@@ -708,8 +706,7 @@
708706
709707 void mlx4_en_tx_irq(struct mlx4_cq *mcq);
710708 u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,
711
- struct net_device *sb_dev,
712
- select_queue_fallback_t fallback);
709
+ struct net_device *sb_dev);
713710 netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev);
714711 netdev_tx_t mlx4_en_xmit_frame(struct mlx4_en_rx_ring *rx_ring,
715712 struct mlx4_en_rx_alloc *frame,
....@@ -748,8 +745,8 @@
748745 int budget);
749746 int mlx4_en_poll_rx_cq(struct napi_struct *napi, int budget);
750747 int mlx4_en_poll_tx_cq(struct napi_struct *napi, int budget);
751
-bool mlx4_en_process_tx_cq(struct net_device *dev,
752
- struct mlx4_en_cq *cq, int napi_budget);
748
+int mlx4_en_process_tx_cq(struct net_device *dev,
749
+ struct mlx4_en_cq *cq, int napi_budget);
753750 u32 mlx4_en_free_tx_desc(struct mlx4_en_priv *priv,
754751 struct mlx4_en_tx_ring *ring,
755752 int index, u64 timestamp,