Skip to content

Commit 9cf2f43

Browse files
lxindavem330
authored andcommitted
team: fix netconsole setup over team
The same fix in Commit dbe1730 ("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: 0fb52a2 ("team: cleanup netpoll clode") Reported-by: João Avelino Bellomo Filho <[email protected]> Signed-off-by: Xin Long <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6cd968f commit 9cf2f43

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

drivers/net/team/team.c

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,14 +1072,11 @@ static void team_port_leave(struct team *team, struct team_port *port)
10721072
}
10731073

10741074
#ifdef CONFIG_NET_POLL_CONTROLLER
1075-
static int team_port_enable_netpoll(struct team *team, struct team_port *port)
1075+
static int __team_port_enable_netpoll(struct team_port *port)
10761076
{
10771077
struct netpoll *np;
10781078
int err;
10791079

1080-
if (!team->dev->npinfo)
1081-
return 0;
1082-
10831080
np = kzalloc(sizeof(*np), GFP_KERNEL);
10841081
if (!np)
10851082
return -ENOMEM;
@@ -1093,6 +1090,14 @@ static int team_port_enable_netpoll(struct team *team, struct team_port *port)
10931090
return err;
10941091
}
10951092

1093+
static int team_port_enable_netpoll(struct team_port *port)
1094+
{
1095+
if (!port->team->dev->npinfo)
1096+
return 0;
1097+
1098+
return __team_port_enable_netpoll(port);
1099+
}
1100+
10961101
static void team_port_disable_netpoll(struct team_port *port)
10971102
{
10981103
struct netpoll *np = port->np;
@@ -1107,7 +1112,7 @@ static void team_port_disable_netpoll(struct team_port *port)
11071112
kfree(np);
11081113
}
11091114
#else
1110-
static int team_port_enable_netpoll(struct team *team, struct team_port *port)
1115+
static int team_port_enable_netpoll(struct team_port *port)
11111116
{
11121117
return 0;
11131118
}
@@ -1221,7 +1226,7 @@ static int team_port_add(struct team *team, struct net_device *port_dev,
12211226
goto err_vids_add;
12221227
}
12231228

1224-
err = team_port_enable_netpoll(team, port);
1229+
err = team_port_enable_netpoll(port);
12251230
if (err) {
12261231
netdev_err(dev, "Failed to enable netpoll on device %s\n",
12271232
portname);
@@ -1918,7 +1923,7 @@ static int team_netpoll_setup(struct net_device *dev,
19181923

19191924
mutex_lock(&team->lock);
19201925
list_for_each_entry(port, &team->port_list, list) {
1921-
err = team_port_enable_netpoll(team, port);
1926+
err = __team_port_enable_netpoll(port);
19221927
if (err) {
19231928
__team_netpoll_cleanup(team);
19241929
break;

0 commit comments

Comments
 (0)