diff options
| -rw-r--r-- | babeld/babel_interface.c | 18 | ||||
| -rw-r--r-- | lib/monotime.h | 6 |
2 files changed, 4 insertions, 20 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index 98c5d21196..00fb58e576 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -60,21 +60,10 @@ static void babel_interface_free (babel_interface_nfo *bi); static vector babel_enable_if; /* enable interfaces (by cmd). */ -int -babel_interface_up (ZAPI_CALLBACK_ARGS) +int babel_ifp_up(struct interface *ifp) { - struct stream *s = NULL; - struct interface *ifp = NULL; - debugf(BABEL_DEBUG_IF, "receive a 'interface up'"); - s = zclient->ibuf; - ifp = zebra_interface_state_read(s, vrf_id); /* it updates iflist */ - - if (ifp == NULL) { - return 0; - } - interface_recalculate(ifp); return 0; } @@ -1235,11 +1224,6 @@ DEFUN (show_babel_parameters, return CMD_SUCCESS; } -int babel_ifp_up(struct interface *ifp) -{ - return 0; -} - void babel_if_init(void) { diff --git a/lib/monotime.h b/lib/monotime.h index 15b6933955..89616c5427 100644 --- a/lib/monotime.h +++ b/lib/monotime.h @@ -81,9 +81,9 @@ static inline time_t monotime(struct timeval *tvo) return ts.tv_sec; } -#define ONE_DAY_SECOND 60*60*24 -#define ONE_WEEK_SECOND ONE_DAY_SECOND*7 -#define ONE_YEAR_SECOND ONE_DAY_SECOND*365 +#define ONE_DAY_SECOND (60 * 60 * 24) +#define ONE_WEEK_SECOND (ONE_DAY_SECOND * 7) +#define ONE_YEAR_SECOND (ONE_DAY_SECOND * 365) /* the following two return microseconds, not time_t! * |