From d1ae988ca517c82a7345b8147b651866ca6df527 Mon Sep 17 00:00:00 2001 From: Jukka Rissanen Date: Thu, 25 Apr 2013 14:47:50 +0300 Subject: [PATCH] rtnl: Interface was added to technology too early The __connman_technology_add_interface() needs to be called after we have created the technology which is done by rtnl->newlink() callback. If this is done the old way, the ethernet devices will not get their interfaces set properly. --- src/rtnl.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/rtnl.c b/src/rtnl.c index ef7f343..af8ab70 100644 --- a/src/rtnl.c +++ b/src/rtnl.c @@ -460,10 +460,8 @@ static void process_newlink(unsigned short type, int index, unsigned flags, if (type == ARPHRD_ETHER) read_uevent(interface); - - __connman_technology_add_interface(interface->service_type, - interface->index, interface->name, interface->ident); - } + } else + interface = NULL; for (list = rtnl_list; list; list = list->next) { struct connman_rtnl *rtnl = list->data; @@ -472,6 +470,16 @@ static void process_newlink(unsigned short type, int index, unsigned flags, rtnl->newlink(type, index, flags, change); } + /* + * The interface needs to be added after the newlink call. + * The newlink will create the technology when needed and + * __connman_technology_add_interface() expects the + * technology to be there already. + */ + if (interface != NULL) + __connman_technology_add_interface(interface->service_type, + interface->index, interface->name, interface->ident); + for (list = watch_list; list; list = list->next) { struct watch_data *watch = list->data; -- 2.7.4