aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-09-05 20:08:42 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-09-05 20:08:42 +0000
commit04c6143ca977a71c39dcf471f5a60d93890df649 (patch)
treed69433cd2701b01674ac59b2f48c8c8e0245e2bc
parentf186bff0ef46b7af0919d723dafe8a9be1c27707 (diff)
downloadupstream-04c6143ca977a71c39dcf471f5a60d93890df649.tar.gz
upstream-04c6143ca977a71c39dcf471f5a60d93890df649.tar.bz2
upstream-04c6143ca977a71c39dcf471f5a60d93890df649.zip
ramips: Use doubletagging to disable ramips_esw vlan by default, it seems more reliable.
Use doubletagging to disable ramips_esw vlan by default, it seems more reliable. Daniel Golle found an issue where sometimes (possibly only for RT3352) the default vlan disable method (clearing en_vlan, untag, doubletag and putting all ports into vlan 0) doesn't work and the packets get sent out vlan-tagged with vlan 0. Instead switch to using the doubletagging method (allow doubletagged packets, put all ports into vlan 0 with untag enabled) by default. Unless someone figures out a way to really globally disable vlan for this switch, this seems like the best (most reliable) option. I did some tests regarding maximum packet size and did not see any difference between the two methods, both allow for slightly bigger packets than the ramips_main.c ethernet driver (ping stops going through above "ping -s 1472" (1514 bytes), on the switch packets are recv_good until "ping -s 1490", or about 1532 bytes). Signed-off-by: Tobias Diedrich <ranma+openwrt@tdiedrich.de> SVN-Revision: 33321
-rw-r--r--target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c b/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c
index 309efdeb78..f01baa1709 100644
--- a/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c
+++ b/target/linux/ramips/files/drivers/net/ethernet/ramips/ramips_esw.c
@@ -534,7 +534,7 @@ rt305x_esw_apply_config(struct switch_dev *dev)
untag |= esw->ports[i].untag << i;
pvid = esw->ports[i].pvid;
} else {
- int x = esw->alt_vlan_disable ? 1 : 0;
+ int x = esw->alt_vlan_disable ? 0 : 1;
doubletag |= x << i;
en_vlan |= x << i;
untag |= x << i;