From c8aacc09c92374f125927583b4f3f8a071a3c1cd Mon Sep 17 00:00:00 2001 From: Scott Feldman Date: Fri, 28 May 2010 03:42:43 -0700 Subject: [PATCH] --- yaml --- r: 199212 b: refs/heads/master c: 045de01a174d9f0734f657eb4b3313d89b4fd5ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/rtnetlink.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1141a4f0ea20..3217a8cb1d54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ca9418350eccd5dd2659931807c1901224dd638 +refs/heads/master: 045de01a174d9f0734f657eb4b3313d89b4fd5ad diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c index 7331bb2f6b9c..1a2af24e9e3d 100644 --- a/trunk/net/core/rtnetlink.c +++ b/trunk/net/core/rtnetlink.c @@ -650,11 +650,12 @@ static inline int rtnl_vfinfo_size(const struct net_device *dev) if (dev->dev.parent && dev_is_pci(dev->dev.parent)) { int num_vfs = dev_num_vf(dev->dev.parent); - size_t size = nlmsg_total_size(sizeof(struct nlattr)); - size += nlmsg_total_size(num_vfs * sizeof(struct nlattr)); - size += num_vfs * (sizeof(struct ifla_vf_mac) + - sizeof(struct ifla_vf_vlan) + - sizeof(struct ifla_vf_tx_rate)); + size_t size = nla_total_size(sizeof(struct nlattr)); + size += nla_total_size(num_vfs * sizeof(struct nlattr)); + size += num_vfs * + (nla_total_size(sizeof(struct ifla_vf_mac)) + + nla_total_size(sizeof(struct ifla_vf_vlan)) + + nla_total_size(sizeof(struct ifla_vf_tx_rate))); return size; } else return 0;