Commit 45c91490 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'team' ("add support for peer notifications and igmp rejoins for team")



Jiri Pirko says:

====================
The middle patch adjusts core infrastructure so the bonding code can be
generalized and reused by team.

v1->v2: using msecs_to_jiffies() as suggested by Eric

Jiri Pirko (3):
  team: add peer notification
  net: convert resend IGMP to notifier event
  team: add support for sending multicast rejoins
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab2cfbb2 492b200e
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment