diff mbox series

[ovs-dev,5/6] lldpd: correctly increase discarded count

Message ID 20201026205745.56604-6-fdangelo@redhat.com
State Changes Requested
Headers show
Series Incorporate fixes from lldpd upstream | expand

Commit Message

Fabrizio D'Angelo Oct. 26, 2020, 8:57 p.m. UTC 
From: Vincent Bernat <vincent@bernat.im>

Upstream commit:
	commit 32f0deeebc9172c3f5f4a4d02aab32e6904947f6
	Date: Sat, 18 Feb 2017 20:11:47 +0100

	lldpd: correctly increase discarded count

	When a frame cannot be decoded but has been guessed, increase the
	discarded count.

	Fix https://github.com/vincentbernat/lldpd/issues/223

Co-authored-by: Fabrizio D'Angelo <fdangelo@redhat.com>
Signed-off-by: Fabrizio D'Angelo <fdangelo@redhat.com>
---
 lib/lldp/lldpd.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/lib/lldp/lldpd.c b/lib/lldp/lldpd.c
index 19e9305266..34738535db 100644
--- a/lib/lldp/lldpd.c
+++ b/lib/lldp/lldpd.c
@@ -244,6 +244,7 @@  lldpd_decode(struct lldpd *cfg, char *frame, int s,
 
     if (s < sizeof(struct eth_header) + 4) {
         /* Too short, just discard it */
+        hw->h_rx_discarded_cnt++;
         return;
     }
 
@@ -284,6 +285,7 @@  lldpd_decode(struct lldpd *cfg, char *frame, int s,
                 VLOG_DBG("function for %s protocol did not "
                          "decode this frame",
                          cfg->g_protocols[i].name);
+                hw->h_rx_discarded_cnt++;
                 return;
             }
             chassis->c_protocol = port->p_protocol = cfg->g_protocols[i].mode;