|
 |
5dee278 |
From 45fd5e7ea1a63a62b70fdf05de782c31222696ad Mon Sep 17 00:00:00 2001
|
|
|
5dee278 |
From: Vincent Bernat <vincent@bernat.im>
|
|
|
5dee278 |
Date: Thu, 12 Nov 2020 19:54:54 -0500
|
|
|
5dee278 |
Subject: [PATCH 5/5] lldp: correctly increase discarded count
|
|
|
5dee278 |
|
|
|
5dee278 |
Upstream commit:
|
|
|
5dee278 |
commit 32f0deeebc9172c3f5f4a4d02aab32e6904947f6
|
|
|
5dee278 |
Date: Sat, 18 Feb 2017 20:11:47 +0100
|
|
|
5dee278 |
|
|
|
5dee278 |
lldpd: correctly increase discarded count
|
|
|
5dee278 |
|
|
|
5dee278 |
When a frame cannot be decoded but has been guessed, increase the
|
|
|
5dee278 |
discarded count.
|
|
|
5dee278 |
|
|
|
5dee278 |
Fix https://github.com/vincentbernat/lldpd/issues/223
|
|
|
5dee278 |
|
|
|
5dee278 |
Fixes: be53a5c447c3 ("auto-attach: Initial support for Auto-Attach standard")
|
|
|
5dee278 |
Co-authored-by: Fabrizio D'Angelo <fdangelo@redhat.com>
|
|
|
5dee278 |
Signed-off-by: Fabrizio D'Angelo <fdangelo@redhat.com>
|
|
|
5dee278 |
Acked-by: Aaron Conole <aconole@redhat.com>
|
|
|
5dee278 |
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
|
|
|
5dee278 |
---
|
|
|
5dee278 |
lib/lldp/lldpd.c | 2 ++
|
|
|
5dee278 |
1 file changed, 2 insertions(+)
|
|
|
5dee278 |
|
|
|
5dee278 |
diff --git a/lib/lldp/lldpd.c b/lib/lldp/lldpd.c
|
|
|
5dee278 |
index 19e930526..34738535d 100644
|
|
|
5dee278 |
--- a/lib/lldp/lldpd.c
|
|
|
5dee278 |
+++ b/lib/lldp/lldpd.c
|
|
|
5dee278 |
@@ -244,6 +244,7 @@ lldpd_decode(struct lldpd *cfg, char *frame, int s,
|
|
|
5dee278 |
|
|
|
5dee278 |
if (s < sizeof(struct eth_header) + 4) {
|
|
|
5dee278 |
/* Too short, just discard it */
|
|
|
5dee278 |
+ hw->h_rx_discarded_cnt++;
|
|
|
5dee278 |
return;
|
|
|
5dee278 |
}
|
|
|
5dee278 |
|
|
|
5dee278 |
@@ -284,6 +285,7 @@ lldpd_decode(struct lldpd *cfg, char *frame, int s,
|
|
|
5dee278 |
VLOG_DBG("function for %s protocol did not "
|
|
|
5dee278 |
"decode this frame",
|
|
|
5dee278 |
cfg->g_protocols[i].name);
|
|
|
5dee278 |
+ hw->h_rx_discarded_cnt++;
|
|
|
5dee278 |
return;
|
|
|
5dee278 |
}
|
|
|
5dee278 |
chassis->c_protocol = port->p_protocol = cfg->g_protocols[i].mode;
|
|
|
5dee278 |
--
|
|
|
5dee278 |
2.28.0
|
|
|
5dee278 |
|