summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-04-17 21:24:29 +0200
committerFelix Fietkau <nbd@openwrt.org>2015-04-17 21:26:39 +0200
commit7f5a597e21127ed30fb9dc579cf7defa46c7f3f2 (patch)
tree5381a12a20c4094c2a9b572e342fa5bc8e9e3ce6
parent8b468ec5022834d04b6be1cf45b4fe4f092c692e (diff)
downloadnetifd-7f5a597e21127ed30fb9dc579cf7defa46c7f3f2.tar.gz
device: remove DEV_ATTR_IFNAME, it is unused
Ensures that interfaces with only 'ifname' matching the device config don't cause iface->device_config to be set Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-rw-r--r--bridge.c2
-rw-r--r--device.c1
-rw-r--r--device.h1
3 files changed, 1 insertions, 3 deletions
diff --git a/bridge.c b/bridge.c
index c5e17a4..fd553dc 100644
--- a/bridge.c
+++ b/bridge.c
@@ -621,7 +621,7 @@ bridge_reload(struct device *dev, struct blob_attr *attr)
diff = 0;
uci_blob_diff(tb_dev, otb_dev, &device_attr_list, &diff);
- if (diff & ~(1 << DEV_ATTR_IFNAME))
+ if (diff)
ret = DEV_CONFIG_RESTART;
blobmsg_parse(bridge_attrs, __BRIDGE_ATTR_MAX, otb_br,
diff --git a/device.c b/device.c
index 24c7fe3..092c2d9 100644
--- a/device.c
+++ b/device.c
@@ -32,7 +32,6 @@ static struct avl_tree devices;
static const struct blobmsg_policy dev_attrs[__DEV_ATTR_MAX] = {
[DEV_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING },
- [DEV_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY },
[DEV_ATTR_MTU] = { .name = "mtu", .type = BLOBMSG_TYPE_INT32 },
[DEV_ATTR_MACADDR] = { .name = "macaddr", .type = BLOBMSG_TYPE_STRING },
[DEV_ATTR_TXQUEUELEN] = { .name = "txqueuelen", .type = BLOBMSG_TYPE_INT32 },
diff --git a/device.h b/device.h
index 391b8c9..334a238 100644
--- a/device.h
+++ b/device.h
@@ -26,7 +26,6 @@ typedef int (*device_state_cb)(struct device *, bool up);
enum {
DEV_ATTR_TYPE,
- DEV_ATTR_IFNAME,
DEV_ATTR_MTU,
DEV_ATTR_MACADDR,
DEV_ATTR_TXQUEUELEN,