[LEDE-DEV] [PATCH netifd] wireless: fix _wireless_add_process
The pid is in $1, not $pid.
Use proper test condition for nonmatching exe warning.
Signed-off-by: Günther Kelleter
---
scripts/netifd-wireless.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh
index 87d13ca..106c49d 100644
--- a/scripts/netifd-wireless.sh
+++ b/scripts/netifd-wireless.sh
@@ -163,8 +163,8 @@ _wireless_add_process() {
json_add_int pid "$1"
json_add_string exe "$exe"
[ -n "$3" ] && json_add_boolean required 1
- exe2="$(readlink -f /proc/$pid/exe)"
- [ "$exe" = "$exe2" ] && echo "WARNING (wireless_add_process):
executable path $exe does not match process $1 path ($exe2)"
+ exe2="$(readlink -f /proc/$1/exe)"
+ [ "$exe" != "$exe2" ] && echo "WARNING (wireless_add_process):
executable path $exe does not match process $1 path ($exe2)"
_wdev_notify
}
--
2.10.2.101.g2cc9ff1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH netifd] device: extend interface.macaddr option to refer to another interface
e.g. option macaddr "@eth0" tells netifd to use the MAC of interface eth0.
Use case: set MAC address of a bridge interface to a specific interface's
MAC regardless of bridge/interface initialization order.
Signed-off-by: Günther Kelleter
---
device.c | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/device.c b/device.c
index 82596e4..c63ddc7 100644
--- a/device.c
+++ b/device.c
@@ -256,7 +256,21 @@ device_init_settings(struct device *dev, struct blob_attr
**tb)
}
if ((cur = tb[DEV_ATTR_MACADDR])) {
- ea = ether_aton(blobmsg_data(cur));
+ const char *data = blobmsg_data(cur);
+ struct device_settings ds = {0};
+ if (data[0] == '@') {
+ struct device dev = {0};
+ strncpy(dev.ifname, data + 1, sizeof dev.ifname);
+ dev.ifname[sizeof dev.ifname - 1] = '\0';
+ system_if_get_settings(&dev, &ds);
+ if (ds.flags & DEV_OPT_MACADDR) {
+ ea = (struct ether_addr *)ds.macaddr;
+ } else {
+ ea = NULL;
+ }
+ } else {
+ ea = ether_aton(blobmsg_data(cur));
+ }
if (ea) {
memcpy(s->macaddr, ea, 6);
s->flags |= DEV_OPT_MACADDR;
--
2.10.0.100.gddd73ec
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH netifd] system-linux: check for open failure
Signed-off-by: Günther Kelleter
---
system-linux.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/system-linux.c b/system-linux.c
index 6e4a194..a038987 100644
--- a/system-linux.c
+++ b/system-linux.c
@@ -2489,6 +2489,8 @@ int system_update_ipv6_mtu(struct device *dev, int mtu)
dev->ifname);
int fd = open(buf, O_RDWR);
+ if (fd < 0)
+ return ret;
if (!mtu) {
ssize_t len = read(fd, buf, sizeof(buf) - 1);
--
2.10.0.100.gddd73ec
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
