diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
| commit | 4e262455a252c700f81df75fb8107d112062bba8 (patch) | |
| tree | fbd55c66eebe78ccb60424e560548d1613aa403a /pimd/pim_igmp.c | |
| parent | bfd498f0dab9a1937c6036cd35ed020b64a69e8f (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
Conflicts:
bgpd/bgp_evpn.c
Diffstat (limited to 'pimd/pim_igmp.c')
| -rw-r--r-- | pimd/pim_igmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index 0522420364..c0a58516d9 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -850,8 +850,7 @@ static struct igmp_sock *igmp_sock_new(int fd, struct in_addr ifaddr, snprintf(hash_name, 64, "IGMP %s hash", ifp->name); igmp->igmp_group_hash = hash_create(igmp_group_hash_key, - igmp_group_hash_equal, - hash_name); + igmp_group_hash_equal, hash_name); igmp->fd = fd; igmp->interface = ifp; |