>From 35388da8821a72a71f54cb955146a881f916eb25 Mon Sep 17 00:00:00 2001 From: Xiaotian Feng Date: Thu, 10 Feb 2011 10:48:53 +0800 Subject: [PATCH net-next v2] net: rename group sysfs entry to netdev_group commit a512b92 adds sysfs entry for net device group, but before this commit, tun also uses group sysfs, so after this commit checkin, kernel warns like this: sysfs: cannot create duplicate filename '/devices/virtual/net/vnet0/group' Since tun has used this for years, rename sysfs under tun might break existing userspace, so rename group sysfs entry for net device group is a better choice. Signed-off-by: Xiaotian Feng Cc: "David S. Miller" Cc: Eric Dumazet Cc: Tom Herbert Cc: "Eric W. Biederman" Cc: Stephen Hemminger Cc: Vlad Dogaru --- net/core/net-sysfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 2e4a393..5ceb257 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -330,7 +330,7 @@ static struct device_attribute net_class_attributes[] = { __ATTR(flags, S_IRUGO | S_IWUSR, show_flags, store_flags), __ATTR(tx_queue_len, S_IRUGO | S_IWUSR, show_tx_queue_len, store_tx_queue_len), - __ATTR(group, S_IRUGO | S_IWUSR, show_group, store_group), + __ATTR(netdev_group, S_IRUGO | S_IWUSR, show_group, store_group), {} }; -- 1.7.1