caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ar8216: do not strip vlan tags when running with vlan_enable=0

Browse Source 
SVN-Revision: 29718
This commit is contained in:
Felix Fietkau 2012-01-12 10:15:08 +00:00
parent fbf81c8e79
commit c33e016fa5
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@ -593,10 +593,13 @@ ar8216_hw_apply(struct switch_dev *dev)
pvid = i;
}
if (priv->vlan && (priv->vlan_tagged & (1 << i))) {
egress = AR8216_OUT_ADD_VLAN;
if (priv->vlan) {
if (priv->vlan_tagged & (1 << i))
egress = AR8216_OUT_ADD_VLAN;
else
egress = AR8216_OUT_STRIP_VLAN;
} else {
egress = AR8216_OUT_STRIP_VLAN;
egress = AR8216_OUT_KEEP;
}
if (priv->vlan) {
ingress = AR8216_IN_SECURE;