diff options
author | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-05-05 23:08:44 +0200 |
---|---|---|
committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2017-05-05 23:15:18 +0200 |
commit | b210b827ded22c93a1389156f77c1b73b7723886 (patch) | |
tree | 5de754974e62b18f02042d9e0ef5d9ad50fab440 /bgpd | |
parent | Merge remote-tracking branch 'origin/stable/3.0' (diff) | |
download | frr-b210b827ded22c93a1389156f77c1b73b7723886.tar.xz frr-b210b827ded22c93a1389156f77c1b73b7723886.zip |
bgpd: use correct type for rfapi thread pointer
Pointer to void always points at the same thing so make it the type of
the thing that it points at
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'bgpd')
-rw-r--r-- | bgpd/bgp_route.h | 2 | ||||
-rw-r--r-- | bgpd/rfapi/rfapi_monitor.h | 4 | ||||
-rw-r--r-- | bgpd/rfapi/rfapi_rib.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h index 35994d4f7..9db84b2ca 100644 --- a/bgpd/bgp_route.h +++ b/bgpd/bgp_route.h @@ -85,7 +85,7 @@ struct bgp_info_extra } export; struct { - void *timer; + struct thread *timer; void *hme; /* encap monitor, if this is a VPN route */ struct prefix_rd rd; /* import: route's route-distinguisher */ u_char un_family; /* family of cached un address, 0 if unset */ diff --git a/bgpd/rfapi/rfapi_monitor.h b/bgpd/rfapi/rfapi_monitor.h index be04b0f09..c42e57c56 100644 --- a/bgpd/rfapi/rfapi_monitor.h +++ b/bgpd/rfapi/rfapi_monitor.h @@ -40,7 +40,7 @@ struct rfapi_monitor_vpn #define RFAPI_MON_FLAG_NEEDCALLBACK 0x00000001 /* deferred callback */ //int dcount; /* debugging counter */ - void *timer; + struct thread *timer; }; struct rfapi_monitor_encap @@ -58,7 +58,7 @@ struct rfapi_monitor_eth struct rfapi_descriptor *rfd; /* which NVE requested the route */ struct ethaddr macaddr; uint32_t logical_net_id; - void *timer; + struct thread *timer; }; /* diff --git a/bgpd/rfapi/rfapi_rib.h b/bgpd/rfapi/rfapi_rib.h index 74331a28d..43a5d43ff 100644 --- a/bgpd/rfapi/rfapi_rib.h +++ b/bgpd/rfapi/rfapi_rib.h @@ -78,7 +78,7 @@ struct rfapi_info struct bgp_tea_options *tea_options; struct rfapi_un_option *un_options; struct rfapi_vn_option *vn_options; - void *timer; + struct thread *timer; }; /* |