diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-09-21 22:11:53 +0000 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-09-21 22:11:53 +0000 |
| commit | 844ec28cee41395cdd1cc0cdf8cf0168f9dc1adf (patch) | |
| tree | f2fe0a9a71bb075a5f6f43cd992b89f46b95574f /pimd/pim_assert.c | |
| parent | d0bfb22c223d645e554290ca82581eb06f94ac3b (diff) | |
| parent | 039dc61292de5f3ed5f46316b1940ab6bb184c3f (diff) | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
lib/.gitignore
lib/command.c
lib/command.h
Diffstat (limited to 'pimd/pim_assert.c')
| -rw-r--r-- | pimd/pim_assert.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c index 9f9c9e66f0..d3df6a1102 100644 --- a/pimd/pim_assert.c +++ b/pimd/pim_assert.c @@ -258,9 +258,7 @@ int pim_assert_recv(struct interface *ifp, /* Parse assert group addr */ - offset = pim_parse_addr_group(ifp->name, src_addr, - &msg_group_addr, - curr, curr_size); + offset = pim_parse_addr_group (&msg_group_addr, curr, curr_size); if (offset < 1) { char src_str[100]; pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str)); @@ -275,9 +273,7 @@ int pim_assert_recv(struct interface *ifp, /* Parse assert source addr */ - offset = pim_parse_addr_ucast(ifp->name, src_addr, - &msg_source_addr, - curr, curr_size); + offset = pim_parse_addr_ucast (&msg_source_addr, curr, curr_size); if (offset < 1) { char src_str[100]; pim_inet4_dump("<src?>", src_addr, src_str, sizeof(src_str)); |