scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 01:52:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ucentral: development update

Browse Source 
* another huge data model v2 update

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-05-16 16:40:06 +02:00
parent 0b9087bd44
commit 5a941a18d1
23 changed files with 553 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/0019-lldp-add-TIP-tweaks.patch
View File

@@ -1,19 +1,19 @@
From 370c5dd8d4f2ee66b231062653d2de4c2f2ecd69 Mon Sep 17 00:00:00 2001
From 4b8fbdd73b3da67eeffd9612642218a1b9dc417d Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Fri, 4 Dec 2020 16:29:35 +0100
Subject: [PATCH 19/21] lldp: add TIP tweaks
Subject: [PATCH 01/18] lldp: add TIP tweaks
Signed-off-by: John Crispin <john@phrozen.org>
---
.../network/services/lldpd/files/lldpd.config | 16 +---------------
package/network/services/lldpd/files/lldpd.init | 8 ++++++++
2 files changed, 9 insertions(+), 15 deletions(-)
.../network/services/lldpd/files/lldpd.config | 16 ----------------
package/network/services/lldpd/files/lldpd.init | 6 +++++-
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/package/network/services/lldpd/files/lldpd.config b/package/network/services/lldpd/files/lldpd.config
index 5e7c51ba7e..66a1bfa197 100644
index 5e7c51ba7e..b37dda87bf 100644
--- a/package/network/services/lldpd/files/lldpd.config
+++ b/package/network/services/lldpd/files/lldpd.config
@@ -1,20 +1,6 @@
@@ -1,20 +1,4 @@
config lldpd config
- option enable_cdp 1
- option enable_fdp 1
@@ -33,10 +33,9 @@ index 5e7c51ba7e..66a1bfa197 100644
-
- # interfaces to listen on
- list interface "loopback"
+ list interface "wan"
list interface "lan"
- list interface "lan"
diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init
index 7a5b25e016..8200556786 100644
index 7a5b25e016..4f613ec664 100644
--- a/package/network/services/lldpd/files/lldpd.init
+++ b/package/network/services/lldpd/files/lldpd.init
@@ -10,6 +10,10 @@ LLDPSOCKET=/var/run/lldpd.socket
@@ -50,14 +49,12 @@ index 7a5b25e016..8200556786 100644
find_release_info()
{
[ -s /etc/os-release ] && . /etc/os-release
@@ -38,6 +42,10 @@ write_lldpd_conf()
@@ -37,7 +41,7 @@ write_lldpd_conf()
local iface ifnames=""
for iface in $ifaces; do
local ifname=""
if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then
+ if [ -e "/sys/class/net/$ifname/bridge" -o -e "/sys/class/net/$ifname/lower_bridge" ] ; then
+ local ports=$(jsonfilter -i /etc/board.json -e "@.network.$iface.ifname")
+ [ "${ports// /,}" ] && ifname="${ports// /,}"
+ fi
- if network_get_device ifname "$iface" || [ -e "/sys/class/net/$iface" ]; then
+ if [ -e "/sys/class/net/$iface" ]; then
append ifnames "${ifname:-$iface}" ","
fi
done