|
Zbigniew Jędrzejewski-Szmek |
d743bb |
From 3aeb9ea17c3f3d84077c3bb2367835d96fd57432 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
From: sjoerd-ccu <sjoerd.simons@collabora.co.uk>
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
Date: Tue, 23 May 2017 09:10:59 +0200
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
Subject: [PATCH] networkd-link: Receive LLDP on Bridge slaves not master
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
(#5995)
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
LLDP should be received on bridge slaves as they're the entities
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
directly connected to a peer. Receiving LLDP on the bridge device makes
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
little sense, Linux by default even filters out LLDP going onto the
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
bridge device.
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
Flip the current logic, receive LLDP on bridge slaves don't listen for
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
them on the bridge itself.
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
(cherry picked from commit 764febc23ee9a22fa64981adb0be901f964df93d)
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
src/network/networkd-link.c | 5 ++++-
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
diff
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
index c37bc7f602..b1282931f3 100644
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
@@ -131,7 +131,10 @@ static bool link_lldp_rx_enabled(Link *link) {
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
if (!link->network)
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
return false;
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
- if (link->network->bridge)
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
+
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
+ * connection to their peers not on the bridge master. Linux doesn't
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
+ * even (by default) forward lldp packets to the bridge master.*/
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
+ if (streq_ptr("bridge", link->kind))
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
return false;
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
|
|
Zbigniew Jędrzejewski-Szmek |
d743bb |
return link->network->lldp_mode != LLDP_MODE_NO;
|