aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2010-07-09 05:12:41 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-09 20:41:57 -0400
commitd77535162e736c47978d5c01469c56e1781dc91b (patch)
tree7210d55197b283c72bb8c74a0aeb8cd386b21a74
parent3cfde79c6c7c8002375c4a8e5be7f602fbb9675d (diff)
net: Document that dev_get_stats() returns the given pointer
Document that dev_get_stats() returns the same stats pointer it was given. Remove const qualification from the returned pointer since the caller may do what it likes with that structure. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/netdevice.h4
-rw-r--r--net/core/dev.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 17e95e37aed9..c4fedf000541 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2130,8 +2130,8 @@ extern void netdev_features_change(struct net_device *dev);
2130/* Load a device via the kmod */ 2130/* Load a device via the kmod */
2131extern void dev_load(struct net *net, const char *name); 2131extern void dev_load(struct net *net, const char *name);
2132extern void dev_mcast_init(void); 2132extern void dev_mcast_init(void);
2133extern const struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, 2133extern struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
2134 struct rtnl_link_stats64 *storage); 2134 struct rtnl_link_stats64 *storage);
2135extern void dev_txq_stats_fold(const struct net_device *dev, 2135extern void dev_txq_stats_fold(const struct net_device *dev,
2136 struct rtnl_link_stats64 *stats); 2136 struct rtnl_link_stats64 *stats);
2137 2137
diff --git a/net/core/dev.c b/net/core/dev.c
index 79ee26ef5095..e2b9fa2c917e 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5323,13 +5323,13 @@ static void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64,
5323 * @dev: device to get statistics from 5323 * @dev: device to get statistics from
5324 * @storage: place to store stats 5324 * @storage: place to store stats
5325 * 5325 *
5326 * Get network statistics from device. The device driver may provide 5326 * Get network statistics from device. Return @storage.
5327 * its own method by setting dev->netdev_ops->get_stats64 or 5327 * The device driver may provide its own method by setting
5328 * dev->netdev_ops->get_stats; otherwise the internal statistics 5328 * dev->netdev_ops->get_stats64 or dev->netdev_ops->get_stats;
5329 * structure is used. 5329 * otherwise the internal statistics structure is used.
5330 */ 5330 */
5331const struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, 5331struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
5332 struct rtnl_link_stats64 *storage) 5332 struct rtnl_link_stats64 *storage)
5333{ 5333{
5334 const struct net_device_ops *ops = dev->netdev_ops; 5334 const struct net_device_ops *ops = dev->netdev_ops;
5335 5335