diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-11-03 20:57:06 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-11-03 20:57:06 +0100 |
| commit | 5c0c0bb557b17c581d4f238c52b0b44ada34a608 (patch) | |
| tree | e0aeacdaced121b1c8d1b6304b3e3d192afeee1d | |
| parent | 1b48b50c9669ecf3fdd3f50d662fbfd18b971014 (diff) | |
fix interface event handling, suppress redundant down events
| -rw-r--r-- | interface.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/interface.c b/interface.c index 787d7d9..257eaca 100644 --- a/interface.c +++ b/interface.c @@ -100,6 +100,8 @@ interface_flush_state(struct interface *iface) static void mark_interface_down(struct interface *iface) { + if (iface->state == IFS_UP) + interface_event(iface, IFEV_DOWN); interface_flush_state(iface); iface->state = IFS_DOWN; } @@ -113,8 +115,9 @@ __interface_set_down(struct interface *iface, bool force) iface->state == IFS_TEARDOWN) return; + if (iface->state == IFS_UP) + interface_event(iface, IFEV_DOWN); iface->state = IFS_TEARDOWN; - interface_event(iface, IFEV_DOWN); interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force); if (force) interface_flush_state(iface); @@ -274,8 +277,9 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve return; netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name); + if (iface->state == IFS_UP) + interface_event(iface, IFEV_DOWN); iface->state = IFS_SETUP; - interface_event(iface, IFEV_DOWN); break; } } |