diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 18:31:49 +0200 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2016-10-20 18:31:49 +0200 |
| commit | 0a538fc98fb662b4cf2d927ac29fd9af4a4fab03 (patch) | |
| tree | f6dbe2af92d44f9a77e4802cefb440811dd69584 /tests | |
| parent | Merge branch 'cmaster-next' into vtysh-grammar (diff) | |
| parent | lib: Fix redist memory free'ing (diff) | |
| download | frr-0a538fc98fb662b4cf2d927ac29fd9af4a4fab03.tar.xz frr-0a538fc98fb662b4cf2d927ac29fd9af4a4fab03.zip | |
Merge branch 'cmaster-next' into vtysh-grammar
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Conflicts:
isisd/isis_routemap.c
zebra/rt_netlink.c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-checksum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-checksum.c b/tests/test-checksum.c index b6741f305..53ab260e2 100644 --- a/tests/test-checksum.c +++ b/tests/test-checksum.c @@ -44,7 +44,7 @@ typedef size_t testsz_t; typedef uint16_t testoff_t; /* Fletcher Checksum -- Refer to RFC1008. */ -#define MODX 4102 +#define MODX 4102U /* The final reduction phase. * This one should be the original ospfd version @@ -391,7 +391,7 @@ verify (u_char * buffer, testsz_t len) while (len) { - partial_len = MIN(len, 5803); + partial_len = MIN(len, 5803U); for (i = 0; i < partial_len; i++) { |