]> git.puffer.fish Git - matthieu/frr.git/commitdiff
Merge pull request #10292 from opensourcerouting/pim6-addr-aux
authorDonald Sharp <donaldsharp72@gmail.com>
Tue, 8 Feb 2022 18:09:08 +0000 (13:09 -0500)
committerGitHub <noreply@github.com>
Tue, 8 Feb 2022 18:09:08 +0000 (13:09 -0500)
pimd: start tackling IPv6 address operations

1  2 
pimd/pim_bsm.c
pimd/pim_cmd.c
pimd/pim_iface.c
pimd/pim_msdp.c
pimd/pim_nht.c
pimd/pim_vty.c

diff --cc pimd/pim_bsm.c
Simple merge
diff --cc pimd/pim_cmd.c
Simple merge
Simple merge
diff --cc pimd/pim_msdp.c
Simple merge
diff --cc pimd/pim_nht.c
Simple merge
diff --cc pimd/pim_vty.c
Simple merge