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

backfire: generic: rtl8366_smi: init VLANs only in first switch initialization (backport of r24936)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24996 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-01-14 18:19:36 +00:00
parent dfb3103e2a
commit 8df64213e2
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.c
View File

@ -507,26 +507,39 @@ int rtl8366_reset_vlan(struct rtl8366_smi *smi)
return err;
}
for (i = 0; i < smi->num_ports; i++) {
if (i == smi->cpu_port)
continue;
err = rtl8366_set_vlan(smi, (i + 1),
(1 << i) | (1 << smi->cpu_port),
(1 << i) | (1 << smi->cpu_port),
0);
if (err)
return err;
err = rtl8366_set_pvid(smi, i, (i + 1));
if (err)
return err;
}
return 0;
}
EXPORT_SYMBOL_GPL(rtl8366_reset_vlan);
static int rtl8366_init_vlan(struct rtl8366_smi *smi)
{
int port;
int err;
err = rtl8366_reset_vlan(smi);
if (err)
return err;
for (port = 0; port < smi->num_ports; port++) {
u32 mask;
if (port == smi->cpu_port)
mask = (1 << smi->num_ports) - 1;
else
mask = (1 << port) | (1 << smi->cpu_port);
err = rtl8366_set_vlan(smi, (port + 1), mask, mask, 0);
if (err)
return err;
err = rtl8366_set_pvid(smi, port, (port + 1));
if (err)
return err;
}
return rtl8366_enable_vlan(smi, 1);
}
#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS
int rtl8366_debugfs_open(struct inode *inode, struct file *file)
{
@ -1169,6 +1182,13 @@ int rtl8366_smi_init(struct rtl8366_smi *smi)
goto err_free_sck;
}
err = rtl8366_init_vlan(smi);
if (err) {
dev_err(smi->parent, "VLAN initialization failed, err=%d\n",
err);
goto err_free_sck;
}
err = rtl8366_smi_mii_init(smi);
if (err)
goto err_free_sck;