You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1.3 KiB
41 lines
1.3 KiB
From 800ce88f52c68e9754d9d9085daf47cf90bb10cf Mon Sep 17 00:00:00 2001
|
|
From: Jonas Johansson <jonasj76@gmail.com>
|
|
Date: Thu, 12 Nov 2020 19:54:51 -0500
|
|
Subject: [PATCH 2/5] lldp: Fix size of PEEK_DISCARD_UINT32()
|
|
|
|
Upstream commit:
|
|
commit a8d8006c06d9ac16ebcf33295cbd625c0847ca9b
|
|
Author: Jonas Johansson <jonasj76@gmail.com>
|
|
Date: Thu, 21 Apr 2016 11:50:06 +0200
|
|
|
|
Fix size of PEEK_DISCARD_UINT32()
|
|
|
|
Signed-off-by: Jonas Johansson <jonasj76@gmail.com>
|
|
|
|
Fixes: be53a5c447c3 ("auto-attach: Initial support for Auto-Attach standard")
|
|
Reported-by: Jonas Rudloff <jonas.t.rudloff@gmail.com>
|
|
Reported-at: https://github.com/openvswitch/ovs/pull/336
|
|
Signed-off-by: Fabrizio D'Angelo <fdangelo@redhat.com>
|
|
Acked-by: Aaron Conole <aconole@redhat.com>
|
|
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
|
|
---
|
|
lib/lldp/lldp.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/lldp/lldp.c b/lib/lldp/lldp.c
|
|
index e61ce6774..593c5e1c3 100644
|
|
--- a/lib/lldp/lldp.c
|
|
+++ b/lib/lldp/lldp.c
|
|
@@ -59,7 +59,7 @@ VLOG_DEFINE_THIS_MODULE(lldp);
|
|
} while (0)
|
|
#define PEEK_DISCARD_UINT8 PEEK_DISCARD(1)
|
|
#define PEEK_DISCARD_UINT16 PEEK_DISCARD(2)
|
|
-#define PEEK_DISCARD_UINT32 PEEK_DISCARD(3)
|
|
+#define PEEK_DISCARD_UINT32 PEEK_DISCARD(4)
|
|
#define PEEK_CMP(value, bytes) \
|
|
(length -= (bytes), \
|
|
pos += (bytes), \
|
|
--
|
|
2.28.0
|
|
|