Commit 52a4fd77 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

team: do not allow to map disabled ports

Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 122bb046
......@@ -614,8 +614,6 @@ static int team_change_mode(struct team *team, const char *kind)
* Rx path frame handler
************************/
static bool team_port_enabled(struct team_port *port);
/* note: already called with rcu_read_lock */
static rx_handler_result_t team_handle_frame(struct sk_buff **pskb)
{
......@@ -673,10 +671,11 @@ static bool team_port_find(const struct team *team,
return false;
}
static bool team_port_enabled(struct team_port *port)
bool team_port_enabled(struct team_port *port)
{
return port->index != -1;
}
EXPORT_SYMBOL(team_port_enabled);
/*
* Enable/disable port by adding to enabled port hashlist and setting
......
......@@ -359,7 +359,8 @@ static int lb_tx_hash_to_port_mapping_set(struct team *team,
unsigned char hash = ctx->info->array_index;
list_for_each_entry(port, &team->port_list, list) {
if (ctx->data.u32_val == port->dev->ifindex) {
if (ctx->data.u32_val == port->dev->ifindex &&
team_port_enabled(port)) {
rcu_assign_pointer(LB_HTPM_PORT_BY_HASH(lb_priv, hash),
port);
return 0;
......
......@@ -64,6 +64,8 @@ struct team_port {
long mode_priv[0];
};
extern bool team_port_enabled(struct team_port *port);
struct team_mode_ops {
int (*init)(struct team *team);
void (*exit)(struct team *team);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment