net-sysfs: Replace ktype default_attrs field with groups

The kobj_type default_attrs field is being replaced by the
default_groups field. Replace the default_attrs fields in rx_queue_ktype
and netdev_queue_ktype with default_groups. Use the ATTRIBUTE_GROUPS
macro to create rx_queue_default_groups and netdev_queue_default_groups.

This patch was tested by verifying that the sysfs files for the
attributes in the default groups were created.

Signed-off-by: Kimberly Brown <kimbrownkd@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index f8f94303a1f57203eaa28b5ea459ac28c89e1b12..bbf47dfb8a188fa5ae5821939cfcf8c6de867645 100644 (file)
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -863,6 +863,7 @@ static struct attribute *rx_queue_default_attrs[] __ro_after_init = {
 #endif
        NULL
 };
+ATTRIBUTE_GROUPS(rx_queue_default);
 
 static void rx_queue_release(struct kobject *kobj)
 {
@@ -911,7 +912,7 @@ static void rx_queue_get_ownership(struct kobject *kobj,
 static struct kobj_type rx_queue_ktype __ro_after_init = {
        .sysfs_ops = &rx_queue_sysfs_ops,
        .release = rx_queue_release,
-       .default_attrs = rx_queue_default_attrs,
+       .default_groups = rx_queue_default_groups,
        .namespace = rx_queue_namespace,
        .get_ownership = rx_queue_get_ownership,
 };
@@ -1416,6 +1417,7 @@ static struct attribute *netdev_queue_default_attrs[] __ro_after_init = {
 #endif
        NULL
 };
+ATTRIBUTE_GROUPS(netdev_queue_default);
 
 static void netdev_queue_release(struct kobject *kobj)
 {
@@ -1448,7 +1450,7 @@ static void netdev_queue_get_ownership(struct kobject *kobj,
 static struct kobj_type netdev_queue_ktype __ro_after_init = {
        .sysfs_ops = &netdev_queue_sysfs_ops,
        .release = netdev_queue_release,
-       .default_attrs = netdev_queue_default_attrs,
+       .default_groups = netdev_queue_default_groups,
        .namespace = netdev_queue_namespace,
        .get_ownership = netdev_queue_get_ownership,
 };