diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 15:44:09 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-18 15:44:09 +0200 |
| commit | 25c58d6d2bbec1de1ab21d76f8bd2cd6cd65df0b (patch) | |
| tree | abd29b34a96ac6c439369f7b609e3fea1ed4405e | |
| parent | pimd: Thread changes allow pim to crash a boo (diff) | |
| download | frr-25c58d6d2bbec1de1ab21d76f8bd2cd6cd65df0b.tar.xz frr-25c58d6d2bbec1de1ab21d76f8bd2cd6cd65df0b.zip | |
pimd: Address PR Comments
Remove a bit more dead code and unused variable.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | pimd/pim_ssmpingd.c | 3 | ||||
| -rw-r--r-- | pimd/pim_upstream.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c index c907d66d5..dd92ff1b2 100644 --- a/pimd/pim_ssmpingd.c +++ b/pimd/pim_ssmpingd.c @@ -310,13 +310,10 @@ static int ssmpingd_read_msg(struct ssmpingd_sock *ss) static int ssmpingd_sock_read(struct thread *t) { struct ssmpingd_sock *ss; - int sock_fd; int result; ss = THREAD_ARG(t); - sock_fd = THREAD_FD(t); - result = ssmpingd_read_msg(ss); /* Keep reading */ diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 49c0ad3fd..d06703ccb 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -1377,8 +1377,7 @@ pim_upstream_start_register_stop_timer (struct pim_upstream *up, int null_regist { uint32_t time; - if (up->t_rs_timer) - THREAD_TIMER_OFF (up->t_rs_timer); + THREAD_TIMER_OFF (up->t_rs_timer); if (!null_register) { |