diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-05-29 07:02:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-01 02:31:52 +0200 |
| commit | 3f3e7ce4ff87c8ea69acaa7700699fb26baa2914 (patch) | |
| tree | 090b634d4e01b42c3d4aa0f7e74229487d0cb3a2 | |
| parent | list: introduce list_first_entry_or_null (diff) | |
| download | linux-3f3e7ce4ff87c8ea69acaa7700699fb26baa2914.tar.xz linux-3f3e7ce4ff87c8ea69acaa7700699fb26baa2914.zip | |
team: fix port list dump for big number of ports
In case the port list dump does not fit into one skb currently the
dump would start over again. Fix this by continue from the last dumped
port.
Introduced by commit d90f889e9c (team: handle sending port list in the
same way option list is sent)
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/team/team.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 7c43261975bd..d016a76ad44b 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -2374,7 +2374,8 @@ static int team_nl_send_port_list_get(struct team *team, u32 portid, u32 seq, bool incomplete; int i; - port = list_first_entry(&team->port_list, struct team_port, list); + port = list_first_entry_or_null(&team->port_list, + struct team_port, list); start_again: err = __send_and_alloc_skb(&skb, team, portid, send_func); @@ -2402,8 +2403,8 @@ start_again: err = team_nl_fill_one_port_get(skb, one_port); if (err) goto errout; - } else { - list_for_each_entry(port, &team->port_list, list) { + } else if (port) { + list_for_each_entry_from(port, &team->port_list, list) { err = team_nl_fill_one_port_get(skb, port); if (err) { if (err == -EMSGSIZE) { |