diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /bgpd/bgp_routemap.c | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'bgpd/bgp_routemap.c')
| -rw-r--r-- | bgpd/bgp_routemap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 78ad3f08..2d4a8630 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -245,9 +245,8 @@ route_match_peer (void *rule, struct prefix *prefix, route_map_object_t type, { if (sockunion_same (su, &peer->su)) return RMAP_MATCH; - - return RMAP_NOMATCH; } + return RMAP_NOMATCH; } } return RMAP_NOMATCH; @@ -2574,7 +2573,7 @@ ALIAS (no_match_ip_route_source, "Match advertising source address of route\n" "IP access-list number\n" "IP access-list number (expanded range)\n" - "IP standard access-list name\n"); + "IP standard access-list name\n") DEFUN (match_ip_address_prefix_list, match_ip_address_prefix_list_cmd, @@ -2685,7 +2684,7 @@ ALIAS (no_match_ip_route_source_prefix_list, IP_STR "Match advertising source address of route\n" "Match entries of prefix-lists\n" - "IP prefix-list name\n"); + "IP prefix-list name\n") DEFUN (match_metric, match_metric_cmd, |