hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29718 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2012-01-12 10:15:08 +00:00
parent cb544f1fd3
commit a556557bc7
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;