diff options
author | Mark Brown <broonie@kernel.org> | 2014-10-15 10:53:14 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-10-15 10:53:14 +0200 |
commit | bb12d86e9fa99cc23927d5c90b125c31534ecf14 (patch) | |
tree | 9d7a6d3b4a13323863d3799ba289e120ff698d38 /drivers/net/team | |
parent | 51e809ee973d95a49753d554753e1c65a507b0b2 (diff) | |
parent | af4733b50b52d6112c15a2f0253954fc244a81ca (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/net/team')
-rw-r--r-- | drivers/net/team/team.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 26d8c29b59de..979fe433278c 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -647,7 +647,7 @@ static void team_notify_peers(struct team *team) { if (!team->notify_peers.count || !netif_running(team->dev)) return; - atomic_set(&team->notify_peers.count_pending, team->notify_peers.count); + atomic_add(team->notify_peers.count, &team->notify_peers.count_pending); schedule_delayed_work(&team->notify_peers.dw, 0); } @@ -687,7 +687,7 @@ static void team_mcast_rejoin(struct team *team) { if (!team->mcast_rejoin.count || !netif_running(team->dev)) return; - atomic_set(&team->mcast_rejoin.count_pending, team->mcast_rejoin.count); + atomic_add(team->mcast_rejoin.count, &team->mcast_rejoin.count_pending); schedule_delayed_work(&team->mcast_rejoin.dw, 0); } |