diff options
| author | David S. Miller <davem@davemloft.net> | 2013-07-23 16:53:03 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-07-23 16:53:03 -0700 |
| commit | 45c9149024dd082f1ac51fe46b0622f7c923f77f (patch) | |
| tree | 71a8b0b141e7a44afcf18304911d036d5be77c6e /net/ipv4/gre_offload.c | |
| parent | ab2cfbb2bddb7c7bc4394e52e91044d5ff645cb4 (diff) | |
| parent | 492b200efdd20b8fcfdac873f3cd8d4902386581 (diff) | |
| download | linux-rt-45c9149024dd082f1ac51fe46b0622f7c923f77f.tar.gz | |
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>
Diffstat (limited to 'net/ipv4/gre_offload.c')
0 files changed, 0 insertions, 0 deletions