]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'team' ("add support for peer notifications and igmp rejoins for team")
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Jul 2013 23:53:03 +0000 (16:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Jul 2013 23:53:03 +0000 (16:53 -0700)
commit076f259d9e5dc823a9352df33ec2d5561415d4d1
tree71a8b0b141e7a44afcf18304911d036d5be77c6e
parent61e9bcd38afa34b3e3021ad0fce194a42f70d26a
parent3974395546eda5213ebd3cfee1e5f9a97282e6f4
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: David S. Miller <davem@davemloft.net>