diff options
| author | Lakshman Krishnamoorthy <lkrishnamoor@vmware.com> | 2019-06-04 00:36:02 +0200 |
|---|---|---|
| committer | Lakshman Krishnamoorthy <lkrishnamoor@vmware.com> | 2019-06-04 00:43:02 +0200 |
| commit | 2789041a46fd0109fa865a64bc1cf4751360f39e (patch) | |
| tree | 9889aa5c920c47d172a4f6e50f1ff8686be1c8a3 /isisd | |
| parent | Merge pull request #4451 from donaldsharp/routemap_return (diff) | |
| download | frr-2789041a46fd0109fa865a64bc1cf4751360f39e.tar.xz frr-2789041a46fd0109fa865a64bc1cf4751360f39e.zip | |
Revert of PR 4078 and PR 4315
Signed-off-by: Lakshman Krishnamoorthy <lkrishnamoor@vmware.com>
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/isis_routemap.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/isisd/isis_routemap.c b/isisd/isis_routemap.c index 69694f26e..d63676256 100644 --- a/isisd/isis_routemap.c +++ b/isisd/isis_routemap.c @@ -48,9 +48,10 @@ #include "isis_zebra.h" #include "isis_routemap.h" -static enum route_map_match_result_t -route_match_ip_address(void *rule, const struct prefix *prefix, - route_map_object_t type, void *object) +static route_map_result_t route_match_ip_address(void *rule, + const struct prefix *prefix, + route_map_object_t type, + void *object) { struct access_list *alist; @@ -80,7 +81,7 @@ static struct route_map_rule_cmd route_match_ip_address_cmd = { /* ------------------------------------------------------------*/ -static enum route_map_match_result_t +static route_map_result_t route_match_ip_address_prefix_list(void *rule, const struct prefix *prefix, route_map_object_t type, void *object) { @@ -113,9 +114,10 @@ struct route_map_rule_cmd route_match_ip_address_prefix_list_cmd = { /* ------------------------------------------------------------*/ -static enum route_map_match_result_t -route_match_ipv6_address(void *rule, const struct prefix *prefix, - route_map_object_t type, void *object) +static route_map_result_t route_match_ipv6_address(void *rule, + const struct prefix *prefix, + route_map_object_t type, + void *object) { struct access_list *alist; @@ -145,7 +147,7 @@ static struct route_map_rule_cmd route_match_ipv6_address_cmd = { /* ------------------------------------------------------------*/ -static enum route_map_match_result_t +static route_map_result_t route_match_ipv6_address_prefix_list(void *rule, const struct prefix *prefix, route_map_object_t type, void *object) { @@ -178,9 +180,10 @@ struct route_map_rule_cmd route_match_ipv6_address_prefix_list_cmd = { /* ------------------------------------------------------------*/ -static enum route_map_match_result_t -route_set_metric(void *rule, const struct prefix *prefix, - route_map_object_t type, void *object) +static route_map_result_t route_set_metric(void *rule, + const struct prefix *prefix, + route_map_object_t type, + void *object) { uint32_t *metric; struct isis_ext_info *info; |