diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-04-10 21:56:49 +0000 |
| commit | c1bdabf8dd2f22a33fdc35b70b93e871f179445d (patch) | |
| tree | 570e66e842fc556fc643e97aa37e0183ded19f56 /bgpd/bgp_open.c | |
| parent | db59fcc9e02b5755a92e4d2913420c1e09e05517 (diff) | |
| parent | 9334b80b2c84f33d0d749b4a172f1d87a77a8544 (diff) | |
| download | quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.bz2 quagga-c1bdabf8dd2f22a33fdc35b70b93e871f179445d.tar.xz | |
Merge branch 'upstream' into hollywood
Conflicts:
ChangeLog
zebra/zebra_rib.c
Diffstat (limited to 'bgpd/bgp_open.c')
| -rw-r--r-- | bgpd/bgp_open.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c index 38431d4c..84d8191e 100644 --- a/bgpd/bgp_open.c +++ b/bgpd/bgp_open.c @@ -443,7 +443,6 @@ bgp_capability_as4 (struct peer *peer, struct capability_header *hdr) static struct message capcode_str[] = { - { 0, ""}, { CAPABILITY_CODE_MP, "MultiProtocol Extensions" }, { CAPABILITY_CODE_REFRESH, "Route Refresh" }, { CAPABILITY_CODE_ORF, "Cooperative Route Filtering" }, @@ -461,7 +460,7 @@ static size_t cap_minsizes[] = [CAPABILITY_CODE_MP] = sizeof (struct capability_mp_data), [CAPABILITY_CODE_REFRESH] = CAPABILITY_CODE_REFRESH_LEN, [CAPABILITY_CODE_ORF] = sizeof (struct capability_orf_entry), - [CAPABILITY_CODE_RESTART] = sizeof (struct capability_gr) - 2, + [CAPABILITY_CODE_RESTART] = sizeof (struct capability_gr), [CAPABILITY_CODE_AS4] = CAPABILITY_CODE_AS4_LEN, [CAPABILITY_CODE_DYNAMIC] = CAPABILITY_CODE_DYNAMIC_LEN, [CAPABILITY_CODE_REFRESH_OLD] = CAPABILITY_CODE_REFRESH_LEN, |