Skip to content

Commit

Permalink
net: The dev->get_stats pointer is not NULL nowadays.
Browse files Browse the repository at this point in the history
And so does the pointer is returns, but sysfs and netlinks still 
check for both cases.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed May 21, 2008
1 parent 34ac257 commit 96e7408
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 17 deletions.
9 changes: 4 additions & 5 deletions net/core/net-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,11 +242,11 @@ static ssize_t netstat_show(const struct device *d,
offset % sizeof(unsigned long) != 0);

read_lock(&dev_base_lock);
if (dev_isalive(dev) && dev->get_stats &&
(stats = (*dev->get_stats)(dev)))
if (dev_isalive(dev)) {
stats = dev->get_stats(dev);
ret = sprintf(buf, fmt_ulong,
*(unsigned long *)(((u8 *) stats) + offset));

}
read_unlock(&dev_base_lock);
return ret;
}
Expand Down Expand Up @@ -457,8 +457,7 @@ int netdev_register_kobject(struct net_device *net)
strlcpy(dev->bus_id, net->name, BUS_ID_SIZE);

#ifdef CONFIG_SYSFS
if (net->get_stats)
*groups++ = &netstat_group;
*groups++ = &netstat_group;

#ifdef CONFIG_WIRELESS_EXT
if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats)
Expand Down
20 changes: 8 additions & 12 deletions net/core/rtnetlink.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,6 +606,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
{
struct ifinfomsg *ifm;
struct nlmsghdr *nlh;
struct net_device_stats *stats;
struct nlattr *attr;

nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ifm), flags);
if (nlh == NULL)
Expand Down Expand Up @@ -652,19 +654,13 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
NLA_PUT(skb, IFLA_BROADCAST, dev->addr_len, dev->broadcast);
}

if (dev->get_stats) {
struct net_device_stats *stats = dev->get_stats(dev);
if (stats) {
struct nlattr *attr;
attr = nla_reserve(skb, IFLA_STATS,
sizeof(struct rtnl_link_stats));
if (attr == NULL)
goto nla_put_failure;

attr = nla_reserve(skb, IFLA_STATS,
sizeof(struct rtnl_link_stats));
if (attr == NULL)
goto nla_put_failure;

copy_rtnl_link_stats(nla_data(attr), stats);
}
}
stats = dev->get_stats(dev);
copy_rtnl_link_stats(nla_data(attr), stats);

if (dev->rtnl_link_ops) {
if (rtnl_link_fill(skb, dev) < 0)
Expand Down

0 comments on commit 96e7408

Please sign in to comment.