Modify

Opened 7 years ago

Closed 7 years ago

Last modified 4 years ago

#8577 closed defect (fixed)

WAN port fails due to VLAN error on ramips device

Reported by: daryl.tanner@… Owned by: developers
Priority: normal Milestone: Barrier Breaker 14.07
Component: base system Version: Trunk
Keywords: Cc:

Description

Discovered problem on ramips device (DIR615 rev D) where incoming packets on WAN interface (port 4) are being incorrectly tagged as VLAN 1 (shoud be 2). Hence WAN interface appears to not work.

Found 2 errors in patch 24339. I corrected these and rebuilt with latest, which now works OK.

Can these be added to trunk. Thanks.

svn diff below:

Index: target/linux/ramips/files/drivers/net/ramips_esw.c
===================================================================
--- target/linux/ramips/files/drivers/net/ramips_esw.c	(revision 24894)
+++ target/linux/ramips/files/drivers/net/ramips_esw.c	(working copy)
@@ -5,7 +5,8 @@
 
 #define RT305X_ESW_REG_FCT0		0x08
 #define RT305X_ESW_REG_PFC1		0x14
-#define RT305X_ESW_REG_PVIDC(_n)	(0x48 + 4 * (_n))
+// reg offset below changed to 0x40 as this is the start of PVIDC block
+#define RT305X_ESW_REG_PVIDC(_n)	(0x40 + 4 * (_n))
 #define RT305X_ESW_REG_VLANI(_n)	(0x50 + 4 * (_n))
 #define RT305X_ESW_REG_VMSC(_n)		(0x70 + 4 * (_n))
 #define RT305X_ESW_REG_FPA		0x84
@@ -172,7 +173,8 @@
 	s = RT305X_ESW_PVIDC_PVID_S * (port % 2);
 	rt305x_esw_rmw(esw,
 		       RT305X_ESW_REG_PVIDC(port / 2),
-		       RT305X_ESW_PVIDC_PVID_S << s,
+//		       RT305X_ESW_VLANI_VID_S << s, // error corrected in line below
+		       RT305X_ESW_PVIDC_PVID_M << s,
 		       (pvid & RT305X_ESW_PVIDC_PVID_M) << s);
 }

Attachments (0)

Change History (2)

comment:1 Changed 7 years ago by juhosg

  • Resolution set to fixed
  • Status changed from new to closed

Fixed in r24898. Thanks!

comment:2 Changed 4 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.