1 files changed, 7 insertions, 24 deletions

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index afd9d25d1992..6ce3f666d142 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -256,17 +256,6 @@ static void __team_option_inst_mark_removed_port(struct team *team,
         }
 }
 
-static bool __team_option_inst_tmp_find(const struct list_head *opts,
-                                        const struct team_option_inst *needle)
-{
-        struct team_option_inst *opt_inst;
-
-        list_for_each_entry(opt_inst, opts, tmp_list)
-                if (opt_inst == needle)
-                        return true;
-        return false;
-}
-
 static int __team_options_register(struct team *team,
                                    const struct team_option *option,
                                    size_t option_count)
@@ -1267,7 +1256,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
         list_add_tail_rcu(&port->list, &team->port_list);
         team_port_enable(team, port);
         __team_compute_features(team);
-        __team_port_change_port_added(port, !!netif_carrier_ok(port_dev));
+        __team_port_change_port_added(port, !!netif_oper_up(port_dev));
         __team_options_change_check(team);
 
         netdev_info(dev, "Port device %s added\n", portname);
@@ -2460,7 +2449,6 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
         int err = 0;
         int i;
         struct nlattr *nl_option;
-        LIST_HEAD(opt_inst_list);
 
         rtnl_lock();
 
@@ -2480,6 +2468,7 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
                 struct nlattr *opt_attrs[TEAM_ATTR_OPTION_MAX + 1];
                 struct nlattr *attr;
                 struct nlattr *attr_data;
+                LIST_HEAD(opt_inst_list);
                 enum team_option_type opt_type;
                 int opt_port_ifindex = 0; /* != 0 for per-port options */
                 u32 opt_array_index = 0;
@@ -2584,23 +2573,17 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
                         if (err)
                                 goto team_put;
                         opt_inst->changed = true;
-
-                        /* dumb/evil user-space can send us duplicate opt,
-                         * keep only the last one
-                         */
-                        if (__team_option_inst_tmp_find(&opt_inst_list,
-                                                        opt_inst))
-                                continue;
-
                         list_add(&opt_inst->tmp_list, &opt_inst_list);
                 }
                 if (!opt_found) {
                         err = -ENOENT;
                         goto team_put;
                 }
-        }
 
-        err = team_nl_send_event_options_get(team, &opt_inst_list);
+                err = team_nl_send_event_options_get(team, &opt_inst_list);
+                if (err)
+                        break;
+        }
 
 team_put:
         team_nl_team_put(team);
@@ -2932,7 +2915,7 @@ static int team_device_event(struct notifier_block *unused,
 
         switch (event) {
         case NETDEV_UP:
-                if (netif_carrier_ok(dev))
+                if (netif_oper_up(dev))
                         team_port_change_check(port, true);
                 break;
         case NETDEV_DOWN: