From 9823271dbe1e43d1b7eb7707412d96317fb284d5 Mon Sep 17 00:00:00 2001 From: Timur Stukan Date: Tue, 6 Oct 2026 13:32:07 +0300 Subject: [PATCH] bonding: 3ad: remove unused TX state The sm_tx_state field of struct port and tx_states_t enum were introduced in the initial 802.3ad implementation but have never had any users. The TX machine uses ntt and sm_tx_timer_counter instead. Remove them. Signed-off-by: Timur Stukan Reviewed-by: Fernando Fernandez Mancera Link: https://patch.msgid.link/20261006103207.68974-1-timur.stukan.linux@gmail.com Signed-off-by: Jakub Kicinski --- drivers/net/bonding/bond_3ad.c | 1 - include/net/bond_3ad.h | 7 ------- 2 files changed, 8 deletions(-) diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index b8e4b4d68dd6..d91533b80996 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c @@ -2071,7 +2071,6 @@ static void ad_initialize_port(struct port *port, const struct bond_params *bond port->sm_periodic_timer_counter = 0; port->sm_mux_state = 0; port->sm_mux_timer_counter = 0; - port->sm_tx_state = 0; port->aggregator = NULL; port->next_port_in_aggregator = NULL; port->transaction_id = 0; diff --git a/include/net/bond_3ad.h b/include/net/bond_3ad.h index ef667dff2972..9e548d3dca21 100644 --- a/include/net/bond_3ad.h +++ b/include/net/bond_3ad.h @@ -60,12 +60,6 @@ typedef enum { AD_MUX_COLLECTING_DISTRIBUTING /* mux machine */ } mux_states_t; -/* tx machine states(43.4.15 in the 802.3ad standard) */ -typedef enum { - AD_TX_DUMMY, - AD_TRANSMIT /* tx Machine */ -} tx_states_t; - /* churn machine states(43.4.17 in the 802.3ad standard) */ typedef enum { AD_CHURN_MONITOR, /* monitoring for churn */ @@ -231,7 +225,6 @@ typedef struct port { u16 sm_periodic_timer_counter; /* state machine periodic timer counter */ mux_states_t sm_mux_state; /* state machine mux state */ u16 sm_mux_timer_counter; /* state machine mux timer counter */ - tx_states_t sm_tx_state; /* state machine tx state */ u16 sm_tx_timer_counter; /* state machine tx timer counter * (always on - enter to transmit * state 3 time per second)