From 6c8ae18b638af7c8fef44f5aaf30fe2e24e8922d Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Thu, 11 Nov 2010 15:47:59 +0000 Subject: [PATCH] --- yaml --- r: 222032 b: refs/heads/master c: 369cf77a6a3e41b1110506ddf43d45804103bfde h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/rtnetlink.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b6956bdaef04..8c164e615619 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8877870f8a8127b653f8c9a55c6b4de9f96f639b +refs/heads/master: 369cf77a6a3e41b1110506ddf43d45804103bfde diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c index 8121268ddbdd..841c287ef40a 100644 --- a/trunk/net/core/rtnetlink.c +++ b/trunk/net/core/rtnetlink.c @@ -347,16 +347,17 @@ static size_t rtnl_link_get_size(const struct net_device *dev) if (!ops) return 0; - size = nlmsg_total_size(sizeof(struct nlattr)) + /* IFLA_LINKINFO */ - nlmsg_total_size(strlen(ops->kind) + 1); /* IFLA_INFO_KIND */ + size = nla_total_size(sizeof(struct nlattr)) + /* IFLA_LINKINFO */ + nla_total_size(strlen(ops->kind) + 1); /* IFLA_INFO_KIND */ if (ops->get_size) /* IFLA_INFO_DATA + nested data */ - size += nlmsg_total_size(sizeof(struct nlattr)) + + size += nla_total_size(sizeof(struct nlattr)) + ops->get_size(dev); if (ops->get_xstats_size) - size += ops->get_xstats_size(dev); /* IFLA_INFO_XSTATS */ + /* IFLA_INFO_XSTATS */ + size += nla_total_size(ops->get_xstats_size(dev)); return size; }