[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1390501161-7890-1-git-send-email-jiri@resnulli.us>
Date: Thu, 23 Jan 2014 19:19:21 +0100
From: Jiri Pirko <jiri@...nulli.us>
To: netdev@...r.kernel.org
Cc: davem@...emloft.net, sfeldma@...ulusnetworks.com,
nicolas.dichtel@...nd.com, john.r.fastabend@...el.com,
vyasevich@...il.com
Subject: [patch net-next] rtnetlink: remove check for fill_slave_info in rtnl_have_link_slave_info
This check is not needed because the same check is done before
fill_slave_info is used in rtnl_link_slave_info_fill.
Also, by removing this check, kernel will fillup IFLA_INFO_SLAVE_KIND
even for slaves of masters which does not implement fill_slave_info.
Signed-off-by: Jiri Pirko <jiri@...nulli.us>
---
net/core/rtnetlink.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index db6a239..393b1bc 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -482,8 +482,7 @@ static bool rtnl_have_link_slave_info(const struct net_device *dev)
struct net_device *master_dev;
master_dev = netdev_master_upper_dev_get((struct net_device *) dev);
- if (master_dev && master_dev->rtnl_link_ops &&
- master_dev->rtnl_link_ops->fill_slave_info)
+ if (master_dev && master_dev->rtnl_link_ops)
return true;
return false;
}
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists