[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20081022152144.944690300@theryb.frec.bull.fr>
Date: Wed, 22 Oct 2008 17:22:14 +0200
From: Benjamin Thery <benjamin.thery@...l.net>
To: netdev <netdev@...r.kernel.org>, Dave Miller <davem@...emloft.net>
Cc: Eric Biederman <ebiederm@...ssion.com>,
Greg Kroah-Hartman <gregkh@...e.de>,
Al Viro <viro@....linux.org.uk>,
Serge Hallyn <serue@...ibm.com>,
Daniel Lezcano <dlezcano@...ibm.com>,
linux-kernel@...r.kernel.org, Tejun Heo <htejun@...il.com>,
Denis Lunev <den@...nvz.org>,
Linux Containers <containers@...ts.linux-foundation.org>,
Benjamin Thery <benjamin.thery@...l.net>
Subject: [PATCH 3/4] net: cleanup some vars names to be more consistant with
the network code
This small patch renames a couple of net_device variables from
'net' to 'netdev' to avoid confusion with 'struct net' variables
that will be introduced in the next patch.
'net' is commonly used to designate 'struct net' in the rest of
the network code.
Signed-off-by: Benjamin Thery <benjamin.thery@...l.net>
Acked-by: Serge Hallyn <serue@...ibm.com>
---
net/core/net-sysfs.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
Index: net-next-2.6/net/core/net-sysfs.c
===================================================================
--- net-next-2.6.orig/net/core/net-sysfs.c
+++ net-next-2.6/net/core/net-sysfs.c
@@ -471,32 +471,33 @@ static struct class net_class = {
/* Delete sysfs entries but hold kobject reference until after all
* netdev references are gone.
*/
-void netdev_unregister_kobject(struct net_device * net)
+void netdev_unregister_kobject(struct net_device *netdev)
{
- struct device *dev = &(net->dev);
+ struct device *dev = &(netdev->dev);
kobject_get(&dev->kobj);
device_del(dev);
}
/* Create sysfs entries for network device. */
-int netdev_register_kobject(struct net_device *net)
+int netdev_register_kobject(struct net_device *netdev)
{
- struct device *dev = &(net->dev);
- struct attribute_group **groups = net->sysfs_groups;
+ struct device *dev = &(netdev->dev);
+ struct attribute_group **groups = netdev->sysfs_groups;
dev->class = &net_class;
- dev->platform_data = net;
+ dev->platform_data = netdev;
dev->groups = groups;
BUILD_BUG_ON(BUS_ID_SIZE < IFNAMSIZ);
- strlcpy(dev->bus_id, net->name, BUS_ID_SIZE);
+ strlcpy(dev->bus_id, netdev->name, BUS_ID_SIZE);
#ifdef CONFIG_SYSFS
*groups++ = &netstat_group;
#ifdef CONFIG_WIRELESS_EXT_SYSFS
- if (net->wireless_handlers && net->wireless_handlers->get_wireless_stats)
+ if (netdev->wireless_handlers &&
+ netdev->wireless_handlers->get_wireless_stats)
*groups++ = &wireless_group;
#endif
#endif /* CONFIG_SYSFS */
--
--
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