| From: Xin Long <lucien.xin@gmail.com> |
| Date: Tue, 24 Apr 2018 14:33:37 +0800 |
| Subject: team: fix netconsole setup over team |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 9cf2f437ca5b39828984064fad213e68fc17ef11 upstream. |
| |
| The same fix in Commit dbe173079ab5 ("bridge: fix netconsole |
| setup over bridge") is also needed for team driver. |
| |
| While at it, remove the unnecessary parameter *team from |
| team_port_enable_netpoll(). |
| |
| v1->v2: |
| - fix it in a better way, as does bridge. |
| |
| Fixes: 0fb52a27a04a ("team: cleanup netpoll clode") |
| Reported-by: João Avelino Bellomo Filho <jbellomo@redhat.com> |
| Signed-off-by: Xin Long <lucien.xin@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/net/team/team.c | 19 ++++++++++++------- |
| 1 file changed, 12 insertions(+), 7 deletions(-) |
| |
| --- a/drivers/net/team/team.c |
| +++ b/drivers/net/team/team.c |
| @@ -1052,14 +1052,11 @@ static void team_port_leave(struct team |
| } |
| |
| #ifdef CONFIG_NET_POLL_CONTROLLER |
| -static int team_port_enable_netpoll(struct team *team, struct team_port *port) |
| +static int __team_port_enable_netpoll(struct team_port *port) |
| { |
| struct netpoll *np; |
| int err; |
| |
| - if (!team->dev->npinfo) |
| - return 0; |
| - |
| np = kzalloc(sizeof(*np), GFP_KERNEL); |
| if (!np) |
| return -ENOMEM; |
| @@ -1073,6 +1070,14 @@ static int team_port_enable_netpoll(stru |
| return err; |
| } |
| |
| +static int team_port_enable_netpoll(struct team_port *port) |
| +{ |
| + if (!port->team->dev->npinfo) |
| + return 0; |
| + |
| + return __team_port_enable_netpoll(port); |
| +} |
| + |
| static void team_port_disable_netpoll(struct team_port *port) |
| { |
| struct netpoll *np = port->np; |
| @@ -1087,7 +1092,7 @@ static void team_port_disable_netpoll(st |
| kfree(np); |
| } |
| #else |
| -static int team_port_enable_netpoll(struct team *team, struct team_port *port) |
| +static int team_port_enable_netpoll(struct team_port *port) |
| { |
| return 0; |
| } |
| @@ -1175,7 +1180,7 @@ static int team_port_add(struct team *te |
| goto err_vids_add; |
| } |
| |
| - err = team_port_enable_netpoll(team, port); |
| + err = team_port_enable_netpoll(port); |
| if (err) { |
| netdev_err(dev, "Failed to enable netpoll on device %s\n", |
| portname); |
| @@ -1880,7 +1885,7 @@ static int team_netpoll_setup(struct net |
| |
| mutex_lock(&team->lock); |
| list_for_each_entry(port, &team->port_list, list) { |
| - err = team_port_enable_netpoll(team, port); |
| + err = __team_port_enable_netpoll(port); |
| if (err) { |
| __team_netpoll_cleanup(team); |
| break; |
