Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / team / team_mode_roundrobin.c

diff --git a/drivers/net/team/team_mode_roundrobin.c b/drivers/net/team/team_mode_roundrobin.c
index 105135aa8f0586844927b641951087110a834cc1..d268e4de781b46b3cf2e3364770098f43f48d760 100644 (file)
--- a/drivers/net/team/team_mode_roundrobin.c
+++ b/drivers/net/team/team_mode_roundrobin.c
@@ -25,26 +25,6 @@ static struct rr_priv *rr_priv(struct team *team)
        return (struct rr_priv *) &team->mode_priv;
 }
 
-static struct team_port *__get_first_port_up(struct team *team,
-                                            struct team_port *port)
-{
-       struct team_port *cur;
-
-       if (team_port_txable(port))
-               return port;
-       cur = port;
-       list_for_each_entry_continue_rcu(cur, &team->port_list, list)
-               if (team_port_txable(port))
-                       return cur;
-       list_for_each_entry_rcu(cur, &team->port_list, list) {
-               if (cur == port)
-                       break;
-               if (team_port_txable(port))
-                       return cur;
-       }
-       return NULL;
-}
-
 static bool rr_transmit(struct team *team, struct sk_buff *skb)
 {
        struct team_port *port;
@@ -52,7 +32,7 @@ static bool rr_transmit(struct team *team, struct sk_buff *skb)
 
        port_index = rr_priv(team)->sent_packets++ % team->en_port_count;
        port = team_get_port_by_index_rcu(team, port_index);
-       port = __get_first_port_up(team, port);
+       port = team_get_first_port_txable_rcu(team, port);
        if (unlikely(!port))
                goto drop;
        if (team_dev_queue_xmit(team, port, skb))
@@ -64,20 +44,10 @@ drop:
        return false;
 }
 
-static int rr_port_enter(struct team *team, struct team_port *port)
-{
-       return team_port_set_team_dev_addr(port);
-}
-
-static void rr_port_change_dev_addr(struct team *team, struct team_port *port)
-{
-       team_port_set_team_dev_addr(port);
-}
-
 static const struct team_mode_ops rr_mode_ops = {
        .transmit               = rr_transmit,
-       .port_enter             = rr_port_enter,
-       .port_change_dev_addr   = rr_port_change_dev_addr,
+       .port_enter             = team_modeop_port_enter,
+       .port_change_dev_addr   = team_modeop_port_change_dev_addr,
 };
 
 static const struct team_mode rr_mode = {