diff options
| author |   Xiaotian Feng <dfeng@redhat.com> | 2011-02-09 19:16:15 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-02-09 19:16:15 -0800 |
| commit | b6644cb706610874104dbf3359e3b67aa59cbc27 (patch) | |
| tree | 7df2df479f8a4c886f733d056726655c0666d4f7 /net/core/net-sysfs.c | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (diff) | |
| download | linux-dev-b6644cb706610874104dbf3359e3b67aa59cbc27.tar.xz linux-dev-b6644cb706610874104dbf3359e3b67aa59cbc27.zip | |
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 <dfeng@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | 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 2e4a393dfc3b..5ceb257e860c 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), {} }; |