---

yaml --- r: 171092 b: refs/heads/master c: 0c509a6 h: refs/heads/master v: v3
git-mirror · Oct 30, 2009 · 4ca25ed · 4ca25ed
1 parent 92310e5
commit 4ca25ed
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bd8d53656da72bc065766b5f2a05ca738020b8a
+refs/heads/master: 0c509a6c9393b27a8c5a01acd4a72616206cfc24
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -900,8 +900,8 @@ struct net_device
 
 	/* class/net/name entry */
 	struct device		dev;
-	/* space for optional statistics and wireless sysfs groups */
-	const struct attribute_group *sysfs_groups[3];
+	/* space for optional device, statistics, and wireless sysfs groups */
+	const struct attribute_group *sysfs_groups[4];
 
 	/* rtnetlink link ops */
 	const struct rtnl_link_ops *rtnl_link_ops;

diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c
@@ -544,8 +544,11 @@ int netdev_register_kobject(struct net_device *net)
 	dev_set_name(dev, "%s", net->name);
 
 #ifdef CONFIG_SYSFS
-	*groups++ = &netstat_group;
+	/* Allow for a device specific group */
+	if (*groups)
+		groups++;
 
+	*groups++ = &netstat_group;
 #ifdef CONFIG_WIRELESS_EXT_SYSFS
 	if (net->ieee80211_ptr)
 		*groups++ = &wireless_group;