From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 2 May 2014 17:03:48 +0000 (+0200)
Subject: interface: do not set l3_dev along with main_dev anymore
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7233afd94910cb4583c9555840a990287fd5d642;p=project%2Fnetifd.git

interface: do not set l3_dev along with main_dev anymore

Made unnecessary by recent fixes to l3_dev handling

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/interface.c b/interface.c
index 684fd22..f474246 100644
--- a/interface.c
+++ b/interface.c
@@ -775,15 +775,11 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
 void
 interface_set_main_dev(struct interface *iface, struct device *dev)
 {
-	bool set_l3 = (!dev || iface->main_dev.dev == iface->l3_dev.dev);
 	bool claimed = iface->l3_dev.claimed;
 
 	if (iface->main_dev.dev == dev)
 		return;
 
-	if (set_l3)
-		interface_set_l3_dev(iface, dev);
-
 	device_add_user(&iface->main_dev, dev);
 	if (!dev) {
 		interface_set_link_state(iface, false);