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_static.h | |
| 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_static.h')
| -rw-r--r-- | pimd/pim_static.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pimd/pim_static.h b/pimd/pim_static.h index b3be09e913..07d31d59b7 100644 --- a/pimd/pim_static.h +++ b/pimd/pim_static.h @@ -32,11 +32,9 @@ struct static_route { struct in_addr group; struct in_addr source; - unsigned int iif; + struct channel_oil c_oil; + ifindex_t iif; unsigned char oif_ttls[MAXVIFS]; - int oif_count; - struct mfcctl mc; - time_t creation[MAXVIFS]; }; void pim_static_route_free(struct static_route *s_route); |