aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/team
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/team')
-rw-r--r--drivers/net/team/team.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index 9ce0c51a04d5..5c7547c4f802 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -967,7 +967,6 @@ static struct netpoll_info *team_netpoll_info(struct team *team)
967#endif 967#endif
968 968
969static void __team_port_change_port_added(struct team_port *port, bool linkup); 969static void __team_port_change_port_added(struct team_port *port, bool linkup);
970
971static int team_dev_type_check_change(struct net_device *dev, 970static int team_dev_type_check_change(struct net_device *dev,
972 struct net_device *port_dev); 971 struct net_device *port_dev);
973 972
@@ -1890,8 +1889,8 @@ static int team_nl_cmd_noop(struct sk_buff *skb, struct genl_info *info)
1890 1889
1891 hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq, 1890 hdr = genlmsg_put(msg, info->snd_portid, info->snd_seq,
1892 &team_nl_family, 0, TEAM_CMD_NOOP); 1891 &team_nl_family, 0, TEAM_CMD_NOOP);
1893 if (IS_ERR(hdr)) { 1892 if (!hdr) {
1894 err = PTR_ERR(hdr); 1893 err = -EMSGSIZE;
1895 goto err_msg_put; 1894 goto err_msg_put;
1896 } 1895 }
1897 1896
@@ -2091,8 +2090,8 @@ start_again:
2091 2090
2092 hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags | NLM_F_MULTI, 2091 hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags | NLM_F_MULTI,
2093 TEAM_CMD_OPTIONS_GET); 2092 TEAM_CMD_OPTIONS_GET);
2094 if (IS_ERR(hdr)) 2093 if (!hdr)
2095 return PTR_ERR(hdr); 2094 return -EMSGSIZE;
2096 2095
2097 if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) 2096 if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
2098 goto nla_put_failure; 2097 goto nla_put_failure;
@@ -2317,8 +2316,8 @@ static int team_nl_fill_port_list_get(struct sk_buff *skb,
2317 2316
2318 hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags, 2317 hdr = genlmsg_put(skb, portid, seq, &team_nl_family, flags,
2319 TEAM_CMD_PORT_LIST_GET); 2318 TEAM_CMD_PORT_LIST_GET);
2320 if (IS_ERR(hdr)) 2319 if (!hdr)
2321 return PTR_ERR(hdr); 2320 return -EMSGSIZE;
2322 2321
2323 if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex)) 2322 if (nla_put_u32(skb, TEAM_ATTR_TEAM_IFINDEX, team->dev->ifindex))
2324 goto nla_put_failure; 2323 goto nla_put_failure;