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

backfire: generic: rtl8366: enable vlans before enabling the ports (backport of r24939)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@24999 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-01-14 18:19:52 +00:00
parent 12e380be62
commit c4b72922ba
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,7 +448,7 @@ static int rtl8366_set_pvid(struct rtl8366_smi *smi, unsigned port,
return -ENOSPC;
}
static int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
{
int err;
@ -465,6 +465,7 @@ static int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable)
return err;
}
EXPORT_SYMBOL_GPL(rtl8366_enable_vlan);
static int rtl8366_enable_vlan4k(struct rtl8366_smi *smi, int enable)
{

1
target/linux/generic-2.6/files/drivers/net/phy/rtl8366_smi.h
View File

@ -104,6 +104,7 @@ int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data);
int rtl8366_smi_rmwr(struct rtl8366_smi *smi, u32 addr, u32 mask, u32 data);
int rtl8366_reset_vlan(struct rtl8366_smi *smi);
int rtl8366_enable_vlan(struct rtl8366_smi *smi, int enable);
int rtl8366_enable_all_ports(struct rtl8366_smi *smi, int enable);
#ifdef CONFIG_RTL8366S_PHY_DEBUG_FS

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

@ -963,6 +963,10 @@ static int rtl8366rb_sw_reset_switch(struct switch_dev *dev)
if (err)
return err;
err = rtl8366_enable_vlan(smi, 1);
if (err)
return err;
return rtl8366_enable_all_ports(smi, 1);
}

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

@ -809,6 +809,10 @@ static int rtl8366s_sw_reset_switch(struct switch_dev *dev)
if (err)
return err;
err = rtl8366_enable_vlan(smi, 1);
if (err)
return err;
return rtl8366_enable_all_ports(smi, 1);
}