lldp: don't send vlan when without_vlans is set

Fixes: 8e9dbbf80918 "lldp: don't send VLANs when there are too many of them
On interface with a lot of vlans, we still have "Too big packet"
notification on version 1.0.14

It looks like retry does exactly the same packet than first try

diff --git a/src/daemon/protocols/lldp.c b/src/daemon/protocols/lldp.c
index 04cca90f30c495b7a7ca7609f2d7a02339eb0053..81397aaf35f09b0c5538ec99bbe806f79440edf6 100644 (file)
--- a/src/daemon/protocols/lldp.c
+++ b/src/daemon/protocols/lldp.c
@@ -249,17 +249,19 @@ static int _lldp_send(struct lldpd *global,
                }
        }
        /* VLANs */
-       TAILQ_FOREACH(vlan, &port->p_vlans, v_entries) {
-               vlans++;
-               if (!(
-                     POKE_START_LLDP_TLV(LLDP_TLV_ORG) &&
-                     POKE_BYTES(dot1, sizeof(dot1)) &&
-                     POKE_UINT8(LLDP_TLV_DOT1_VLANNAME) &&
-                     POKE_UINT16(vlan->v_vid) &&
-                     POKE_UINT8(strlen(vlan->v_name)) &&
-                     POKE_BYTES(vlan->v_name, strlen(vlan->v_name)) &&
-                     POKE_END_LLDP_TLV))
-                       goto toobig;
+       if (!without_vlans) {
+               TAILQ_FOREACH(vlan, &port->p_vlans, v_entries) {
+                       vlans++;
+                       if (!(
+                             POKE_START_LLDP_TLV(LLDP_TLV_ORG) &&
+                             POKE_BYTES(dot1, sizeof(dot1)) &&
+                             POKE_UINT8(LLDP_TLV_DOT1_VLANNAME) &&
+                             POKE_UINT16(vlan->v_vid) &&
+                             POKE_UINT8(strlen(vlan->v_name)) &&
+                             POKE_BYTES(vlan->v_name, strlen(vlan->v_name)) &&
+                             POKE_END_LLDP_TLV))
+                               goto toobig;
+               }
        }
        /* Protocol Identities */
        TAILQ_FOREACH(pi, &port->p_pids, p_entries) {