team: do not allow to map disabled ports

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 6b4cf6eca2383c174d2a582f7b35200d6763b7ae..5350eeaa22ce7445d1fdf6c6f1bc0b3b978bbf94 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -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

diff --git a/drivers/net/team/team_mode_loadbalance.c b/drivers/net/team/team_mode_loadbalance.c
index c92fa02d6a63038344beb71b2e035e65e45b68a8..51a4b199c75cbe230bbfff4ef92e818f3883c583 100644 (file)
--- a/drivers/net/team/team_mode_loadbalance.c
+++ b/drivers/net/team/team_mode_loadbalance.c
@@ -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;

diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index c1938869191f9fd1e91aef51cdc5b142adb7ce28..e636a54e7a71adc2ef9a11a8321e109c23efa998 100644 (file)
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -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);