lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

team: update master carrier state

Browse Source 
Update master's carrier state when there is any
change with its ports.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Flavio Leitner
2012-12-30 08:27:29 +00:00
committed by David S. Miller
parent f8ca2b6f03
commit 06a7fc429f
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/team/team.c
View File

@@ -1400,13 +1400,11 @@ static void team_destructor(struct net_device *dev)
static int team_open(struct net_device *dev) static int team_open(struct net_device *dev)
{ {
netif_carrier_on(dev);
return 0; return 0;
} }
static int team_close(struct net_device *dev) static int team_close(struct net_device *dev)
{ {
netif_carrier_off(dev);
return 0; return 0;
} }
@@ -2560,21 +2558,43 @@ send_event:
} }
static void __team_carrier_check(struct team *team)
{
struct team_port *port;
bool team_linkup;
team_linkup = false;
list_for_each_entry(port, &team->port_list, list) {
if (port->linkup) {
team_linkup = true;
break;
}
}
if (team_linkup)
netif_carrier_on(team->dev);
else
netif_carrier_off(team->dev);
}
static void __team_port_change_check(struct team_port *port, bool linkup) static void __team_port_change_check(struct team_port *port, bool linkup)
{ {
if (port->state.linkup != linkup) if (port->state.linkup != linkup)
__team_port_change_send(port, linkup); __team_port_change_send(port, linkup);
__team_carrier_check(port->team);
} }
static void __team_port_change_port_added(struct team_port *port, bool linkup) static void __team_port_change_port_added(struct team_port *port, bool linkup)
{ {
__team_port_change_send(port, linkup); __team_port_change_send(port, linkup);
__team_carrier_check(port->team);
} }
static void __team_port_change_port_removed(struct team_port *port) static void __team_port_change_port_removed(struct team_port *port)
{ {
port->removed = true; port->removed = true;
__team_port_change_send(port, false); __team_port_change_send(port, false);
__team_carrier_check(port->team);
} }
static void team_port_change_check(struct team_port *port, bool linkup) static void team_port_change_check(struct team_port *port, bool linkup)