From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 18 Oct 2011 18:38:44 +0000 (+0200)
Subject: proto-shell: reset l3 device if it was set before
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=commitdiff_plain;h=8e1b0ca9e75668a9663196520af4422b837aa4a6

proto-shell: reset l3 device if it was set before
---

diff --git a/proto-shell.c b/proto-shell.c
index f197c62..415eb74 100644
--- a/proto-shell.c
+++ b/proto-shell.c
@@ -318,11 +318,14 @@ proto_shell_update_link(struct proto_shell_state *state, struct blob_attr **tb)
 	if (!tb[NOTIFY_IFNAME]) {
 		if (!state->proto.iface->main_dev.dev)
 			return UBUS_STATUS_INVALID_ARGUMENT;
-	} else if (!state->l3_dev.dev) {
+	} else {
+		if (state->l3_dev.dev)
+			device_remove_user(&state->l3_dev);
+
 		device_add_user(&state->l3_dev,
 			device_get(blobmsg_data(tb[NOTIFY_IFNAME]), true));
-		device_claim(&state->l3_dev);
 		state->proto.iface->l3_dev = &state->l3_dev;
+		device_claim(&state->l3_dev);
 	}
 
 	interface_ip_update_start(state->proto.iface);