qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:01:55 +02:00
Code

backfire: generic: rtl8366: rename vlan debugfs file to vlan_mc, and clean up it's format (backport of r21923)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21942 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2010-06-26 19:54:27 +00:00
parent 457682c8ca
commit 61406f679a
2 changed files with 26 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
View File

@ -932,20 +932,18 @@ static ssize_t rtl8366rb_read_debugfs_mibs(struct file *file,
return simple_read_from_buffer(user_buf, count, ppos, buf, len); return simple_read_from_buffer(user_buf, count, ppos, buf, len);
} }
static ssize_t rtl8366rb_read_debugfs_vlan(struct file *file, static ssize_t rtl8366rb_read_debugfs_vlan_mc(struct file *file,
char __user *user_buf, char __user *user_buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data; struct rtl8366rb *rtl = (struct rtl8366rb *)file->private_data;
struct rtl8366_smi *smi = &rtl->smi; struct rtl8366_smi *smi = &rtl->smi;
int i, j, len = 0; int i, len = 0;
char *buf = rtl->buf; char *buf = rtl->buf;
len += snprintf(buf + len, sizeof(rtl->buf) - len, len += snprintf(buf + len, sizeof(rtl->buf) - len,
"VLAN Member Config:\n"); "%2s %6s %4s %6s %6s %3s\n",
len += snprintf(buf + len, sizeof(rtl->buf) - len, "id", "vid","prio", "member", "untag", "fid");
"\t id \t vid \t prio \t member \t untag \t fid "
"\tports\n");
for (i = 0; i < RTL8366_NUM_VLANS; ++i) { for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_mc vlanmc;
@ -953,20 +951,9 @@ static ssize_t rtl8366rb_read_debugfs_vlan(struct file *file,
rtl8366rb_get_vlan_mc(smi, i, &vlanmc); rtl8366rb_get_vlan_mc(smi, i, &vlanmc);
len += snprintf(buf + len, sizeof(rtl->buf) - len, len += snprintf(buf + len, sizeof(rtl->buf) - len,
"\t[%d] \t %d \t %d \t 0x%04x \t 0x%04x \t %d " "%2d %6d %4d 0x%04x 0x%04x %3d\n",
"\t", i, vlanmc.vid, vlanmc.priority, i, vlanmc.vid, vlanmc.priority,
vlanmc.member, vlanmc.untag, vlanmc.fid); vlanmc.member, vlanmc.untag, vlanmc.fid);
for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
int index = 0;
if (!rtl8366rb_get_mc_index(smi, j, &index)) {
if (index == i)
len += snprintf(buf + len,
sizeof(rtl->buf) - len,
"%d", j);
}
}
len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
} }
return simple_read_from_buffer(user_buf, count, ppos, buf, len); return simple_read_from_buffer(user_buf, count, ppos, buf, len);
@ -1041,8 +1028,8 @@ static const struct file_operations fops_rtl8366rb_regs = {
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
static const struct file_operations fops_rtl8366rb_vlan = { static const struct file_operations fops_rtl8366rb_vlan_mc = {
.read = rtl8366rb_read_debugfs_vlan, .read = rtl8366rb_read_debugfs_vlan_mc,
.open = rtl8366rb_debugfs_open, .open = rtl8366rb_debugfs_open,
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
@ -1082,11 +1069,11 @@ static void rtl8366rb_debugfs_init(struct rtl8366rb *rtl)
return; return;
} }
node = debugfs_create_file("vlan", S_IRUSR, root, rtl, node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
&fops_rtl8366rb_vlan); &fops_rtl8366rb_vlan_mc);
if (!node) { if (!node) {
dev_err(rtl->parent, "Creating debugfs file '%s' failed\n", dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
"vlan"); "vlan_mc");
return; return;
} }

39
target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
View File

@ -918,20 +918,18 @@ static ssize_t rtl8366s_read_debugfs_mibs(struct file *file,
return simple_read_from_buffer(user_buf, count, ppos, buf, len); return simple_read_from_buffer(user_buf, count, ppos, buf, len);
} }
static ssize_t rtl8366s_read_debugfs_vlan(struct file *file, static ssize_t rtl8366s_read_debugfs_vlan_mc(struct file *file,
char __user *user_buf, char __user *user_buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
struct rtl8366s *rtl = (struct rtl8366s *)file->private_data; struct rtl8366s *rtl = (struct rtl8366s *)file->private_data;
struct rtl8366_smi *smi = &rtl->smi; struct rtl8366_smi *smi = &rtl->smi;
int i, j, len = 0; int i, len = 0;
char *buf = rtl->buf; char *buf = rtl->buf;
len += snprintf(buf + len, sizeof(rtl->buf) - len, len += snprintf(buf + len, sizeof(rtl->buf) - len,
"VLAN Member Config:\n"); "%2s %6s %4s %6s %6s %3s\n",
len += snprintf(buf + len, sizeof(rtl->buf) - len, "id", "vid","prio", "member", "untag", "fid");
"\t id \t vid \t prio \t member \t untag \t fid "
"\tports\n");
for (i = 0; i < RTL8366_NUM_VLANS; ++i) { for (i = 0; i < RTL8366_NUM_VLANS; ++i) {
struct rtl8366_vlan_mc vlanmc; struct rtl8366_vlan_mc vlanmc;
@ -939,20 +937,9 @@ static ssize_t rtl8366s_read_debugfs_vlan(struct file *file,
rtl8366s_get_vlan_mc(smi, i, &vlanmc); rtl8366s_get_vlan_mc(smi, i, &vlanmc);
len += snprintf(buf + len, sizeof(rtl->buf) - len, len += snprintf(buf + len, sizeof(rtl->buf) - len,
"\t[%d] \t %d \t %d \t 0x%04x \t 0x%04x \t %d " "%2d %6d %4d 0x%04x 0x%04x %3d\n",
"\t", i, vlanmc.vid, vlanmc.priority, i, vlanmc.vid, vlanmc.priority,
vlanmc.member, vlanmc.untag, vlanmc.fid); vlanmc.member, vlanmc.untag, vlanmc.fid);
for (j = 0; j < RTL8366_NUM_PORTS; ++j) {
int index = 0;
if (!rtl8366s_get_mc_index(smi, j, &index)) {
if (index == i)
len += snprintf(buf + len,
sizeof(rtl->buf) - len,
"%d", j);
}
}
len += snprintf(buf + len, sizeof(rtl->buf) - len, "\n");
} }
return simple_read_from_buffer(user_buf, count, ppos, buf, len); return simple_read_from_buffer(user_buf, count, ppos, buf, len);
@ -1027,8 +1014,8 @@ static const struct file_operations fops_rtl8366s_regs = {
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
static const struct file_operations fops_rtl8366s_vlan = { static const struct file_operations fops_rtl8366s_vlan_mc = {
.read = rtl8366s_read_debugfs_vlan, .read = rtl8366s_read_debugfs_vlan_mc,
.open = rtl8366s_debugfs_open, .open = rtl8366s_debugfs_open,
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
@ -1068,11 +1055,11 @@ static void rtl8366s_debugfs_init(struct rtl8366s *rtl)
return; return;
} }
node = debugfs_create_file("vlan", S_IRUSR, root, rtl, node = debugfs_create_file("vlan_mc", S_IRUSR, root, rtl,
&fops_rtl8366s_vlan); &fops_rtl8366s_vlan_mc);
if (!node) { if (!node) {
dev_err(rtl->parent, "Creating debugfs file '%s' failed\n", dev_err(rtl->parent, "Creating debugfs file '%s' failed\n",
"vlan"); "vlan_mc");
return; return;
} }