diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2012-03-23 12:15:00 +0000 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2012-03-23 12:15:00 +0000 |
| commit | 4526b03b4c1ac32588cd8f9a3ea71bafe72db9ef (patch) | |
| tree | 48c05781305667727e1dcd2207df6c25976bb488 /bgpd/bgp_open.c | |
| parent | 97f375b3e02e0f4ec18f68fbe36fc5ae16693d26 (diff) | |
| parent | aee567450eaf32877d00f47c4cc5d05c5fb85a51 (diff) | |
| download | quagga-ex23b.tar.bz2 quagga-ex23b.tar.xz | |
Merge branch 'master' into euro_ix_bex23b
v0.99.20ex23b -- Quagga 'master' as at 23-Mar-2012
Conflicts:
bgpd/bgp_attr.c
bgpd/bgp_attr.h
Difference between 'master' and 0.99.20.1 is in these files.
Handling of attributes has been worked over again to common up
checks of the flags, and to use a common parsing structure,
which reduces the clutter of parameters for the individual
attribute parsing functions.
bgpd/bgp_open.c
bgpd/bgp_packet.c
lib/thread.c
ospfd/ospf_packet.c
These were artifacts, caused by common patches in master and
0.99.20.1 -- and some twitchy-ness about whitespace !
Diffstat (limited to 'bgpd/bgp_open.c')
| -rw-r--r-- | bgpd/bgp_open.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index d9db1c99..2360b400 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -468,7 +468,6 @@ bgp_capability_as4 (struct peer *peer, struct capability_header *hdr) if (BGP_DEBUG (as4, AS4)) zlog_debug ("%s [AS4] about to set cap PEER_CAP_AS4_RCV, got as4 %u", peer->host, as4); - return as4; } |