From: Marc Harvey <marcharvey@google.com>
To: jiri@resnulli.us, andrew+netdev@lunn.ch
Cc: willemb@google.com, maheshb@google.com, netdev@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Marc Harvey <marcharvey@google.com>
Subject: [PATCH net-next 3/7] net: team: Rename port_disabled team mode op to port_tx_disabled
Date: Tue, 31 Mar 2026 05:33:49 +0000 [thread overview]
Message-ID: <20260331053353.2504254-4-marcharvey@google.com> (raw)
In-Reply-To: <20260331053353.2504254-1-marcharvey@google.com>
This team mode op is only used by the load balance mode, and it only
uses it in the tx path.
Signed-off-by: Marc Harvey <marcharvey@google.com>
---
drivers/net/team/team_core.c | 4 ++--
drivers/net/team/team_mode_loadbalance.c | 4 ++--
include/linux/if_team.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/team/team_core.c b/drivers/net/team/team_core.c
index e54bd21bd068..2ce31999c99f 100644
--- a/drivers/net/team/team_core.c
+++ b/drivers/net/team/team_core.c
@@ -968,8 +968,8 @@ static void team_port_disable(struct team *team,
{
if (!team_port_enabled(port))
return;
- if (team->ops.port_disabled)
- team->ops.port_disabled(team, port);
+ if (team->ops.port_tx_disabled)
+ team->ops.port_tx_disabled(team, port);
hlist_del_rcu(&port->hlist);
__reconstruct_port_hlist(team, port->index);
WRITE_ONCE(port->index, -1);
diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index 684954c2a8de..840f409d250b 100644
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -655,7 +655,7 @@ static void lb_port_leave(struct team *team, struct team_port *port)
free_percpu(lb_port_priv->pcpu_stats);
}
-static void lb_port_disabled(struct team *team, struct team_port *port)
+static void lb_port_tx_disabled(struct team *team, struct team_port *port)
{
lb_tx_hash_to_port_mapping_null_port(team, port);
}
@@ -665,7 +665,7 @@ static const struct team_mode_ops lb_mode_ops = {
.exit = lb_exit,
.port_enter = lb_port_enter,
.port_leave = lb_port_leave,
- .port_disabled = lb_port_disabled,
+ .port_tx_disabled = lb_port_tx_disabled,
.receive = lb_receive,
.transmit = lb_transmit,
};
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index a761f5282bcf..740cb3100dfc 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -121,7 +121,7 @@ struct team_mode_ops {
int (*port_enter)(struct team *team, struct team_port *port);
void (*port_leave)(struct team *team, struct team_port *port);
void (*port_change_dev_addr)(struct team *team, struct team_port *port);
- void (*port_disabled)(struct team *team, struct team_port *port);
+ void (*port_tx_disabled)(struct team *team, struct team_port *port);
};
extern int team_modeop_port_enter(struct team *team, struct team_port *port);
--
2.53.0.1018.g2bb0e51243-goog
next prev parent reply other threads:[~2026-03-31 5:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-31 5:33 [PATCH net-next 0/7] Decouple receive and transmit enablement in team driver Marc Harvey
2026-03-31 5:33 ` [PATCH net-next 1/7] net: team: Annotate reads and writes for mixed lock accessed values Marc Harvey
2026-03-31 5:33 ` [PATCH net-next 2/7] net: team: Remove unused team_mode_op, port_enabled Marc Harvey
2026-03-31 5:33 ` Marc Harvey [this message]
2026-03-31 5:33 ` [PATCH net-next 4/7] selftests: net: Add tests for failover of team-aggregated ports Marc Harvey
2026-03-31 5:33 ` [PATCH net-next 5/7] selftests: net: Add test for enablement of ports with teamd Marc Harvey
2026-03-31 5:33 ` [PATCH net-next 6/7] net: team: Decouple rx and tx enablement in the team driver Marc Harvey
2026-03-31 5:33 ` [PATCH net-next 7/7] selftests: net: Add tests for team driver decoupled tx and rx control Marc Harvey
2026-03-31 17:33 ` [PATCH net-next 0/7] Decouple receive and transmit enablement in team driver Jakub Kicinski
2026-04-01 1:42 ` Marc Harvey
2026-04-01 1:53 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260331053353.2504254-4-marcharvey@google.com \
--to=marcharvey@google.com \
--cc=andrew+netdev@lunn.ch \
--cc=jiri@resnulli.us \
--cc=linux-kselftest@vger.kernel.org \
--cc=maheshb@google.com \
--cc=netdev@vger.kernel.org \
--cc=willemb@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox