qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-04 11:13:45 +02:00
Code

backfire: generic: rtl8366: enable VLAN ingress filtering (backport of r22044)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22049 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2010-07-03 07:29:27 +00:00
parent be1b70d4b6
commit c56ed47f65
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,6 +70,8 @@
#define RTL8366RB_PHY_NO_OFFSET 9 #define RTL8366RB_PHY_NO_OFFSET 9
#define RTL8366RB_PHY_NO_MASK (0x1f << 9) #define RTL8366RB_PHY_NO_MASK (0x1f << 9)
#define RTL8366RB_VLAN_INGRESS_CTRL2_REG 0x037f
/* LED control registers */ /* LED control registers */
#define RTL8366RB_LED_BLINKRATE_REG 0x0430 #define RTL8366RB_LED_BLINKRATE_REG 0x0430
#define RTL8366RB_LED_BLINKRATE_BIT 0 #define RTL8366RB_LED_BLINKRATE_BIT 0
@ -288,6 +290,12 @@ static int rtl8366rb_hw_init(struct rtl8366_smi *smi)
/* disable auto ageing for all ports */ /* disable auto ageing for all ports */
REG_WR(smi, RTL8366RB_SSCR1, RTL8366RB_PORT_ALL); REG_WR(smi, RTL8366RB_SSCR1, RTL8366RB_PORT_ALL);
/*
* discard VLAN tagged packets if the port is not a member of
* the VLAN with which the packets is associated.
*/
REG_WR(smi, RTL8366RB_VLAN_INGRESS_CTRL2_REG, RTL8366RB_PORT_ALL);
/* don't drop packets whose DA has not been learned */ /* don't drop packets whose DA has not been learned */
REG_RMW(smi, RTL8366RB_SSCR2, RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0); REG_RMW(smi, RTL8366RB_SSCR2, RTL8366RB_SSCR2_DROP_UNKNOWN_DA, 0);

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

@ -112,6 +112,7 @@
#define RTL8366S_VLAN_MEMCONF_BASE 0x0016 #define RTL8366S_VLAN_MEMCONF_BASE 0x0016
#define RTL8366S_VLAN_MEMBERINGRESS_REG 0x0379
#define RTL8366S_PORT_LINK_STATUS_BASE 0x0060 #define RTL8366S_PORT_LINK_STATUS_BASE 0x0060
#define RTL8366S_PORT_STATUS_SPEED_MASK 0x0003 #define RTL8366S_PORT_STATUS_SPEED_MASK 0x0003
@ -299,6 +300,12 @@ static int rtl8366s_hw_init(struct rtl8366_smi *smi)
/* disable auto ageing for all ports */ /* disable auto ageing for all ports */
REG_WR(smi, RTL8366S_SSCR1, RTL8366S_PORT_ALL); REG_WR(smi, RTL8366S_SSCR1, RTL8366S_PORT_ALL);
/*
* discard VLAN tagged packets if the port is not a member of
* the VLAN with which the packets is associated.
*/
REG_WR(smi, RTL8366S_VLAN_MEMBERINGRESS_REG, RTL8366S_PORT_ALL);
/* don't drop packets whose DA has not been learned */ /* don't drop packets whose DA has not been learned */
REG_RMW(smi, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0); REG_RMW(smi, RTL8366S_SSCR2, RTL8366S_SSCR2_DROP_UNKNOWN_DA, 0);