[Zrouter-src-freebsd] ZRouter.org: push to FreeBSD HEAD tree

[zrouter-src-freebsd at zrouter.org]

details:   http://zrouter.org/hg/FreeBSD/head//rev/c74ca48a7283
changeset: 422:c74ca48a7283
user:      ray at terran.dlink.ua
date:      Wed Mar 07 13:12:00 2012 +0200
description:
Fix VLAN valid flag.

diffstat:

 head/sys/dev/switch/bcm5325_switchreg.h |  8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r 48831bd7f442 -r c74ca48a7283 head/sys/dev/switch/bcm5325_switchreg.h
--- a/head/sys/dev/switch/bcm5325_switchreg.h	Wed Mar 07 13:11:34 2012 +0200
+++ b/head/sys/dev/switch/bcm5325_switchreg.h	Wed Mar 07 13:12:00 2012 +0200
@@ -379,11 +379,17 @@
 #define		VLAN_GLOBAL_CTL0_NULV_CHANGE_V	0x02
 #define		VLAN_GLOBAL_CTL0_NULV_CHANGE_PV	0x03
 #define	VLAN_GLOBAL_CTL1		(S1 | PAGE(0x34) | 0x01)
+#define 	VLAN_GLOBAL_CTL1_MCAST_FWDMAP_CHECK	(1 << 3)
+#define 	VLAN_GLOBAL_CTL1_MCAST_UNTAGMAP_CHECK	(1 << 2)
+#define 	VLAN_GLOBAL_CTL1_MCAST_TAGGING		(1 << 1)
 #define	VLAN_GLOBAL_CTL2		(S1 | PAGE(0x34) | 0x02)
 #define	VLAN_DROP_UNTAGGED		(S1 | PAGE(0x34) | 0x03)
 #define		VLAN_DROP_UNTAGGED_ONPORT(_p)	(1 << (_p))
 #define	VLAN_GLOBAL_CTL4		(S1 | PAGE(0x34) | 0x04)
+#define 	VLAN_GLOBAL_CTL4_DROP_VID_VIOLATION	(1 << 6)
 #define	VLAN_GLOBAL_CTL5		(S1 | PAGE(0x34) | 0x05)
+#define 	VLAN_GLOBAL_CTL5_DROP_VTAB_MISS		(1 << 3)
+#define 	VLAN_GLOBAL_CTL5_CRC_TX			(1 << 0)
 #define	VLAN_TABLE_ACCESS		(S2 | PAGE(0x34) | 0x06)
 #define		VLAN_TABLE_ACCESS_RW_ENABLE	0x2000
 #define		VLAN_TABLE_ACCESS_WRITE		0x1000
@@ -407,7 +413,7 @@
 #define	VLAN_WRITE			(S4 | PAGE(0x34) | 0x08)
 #define		VLAN_RW_VALID_5350		0x00100000
 #define		VLAN_RW_VALID_5380 		0x04000000
-#define		VLAN_RW_VALID 			0x4000
+#define		VLAN_RW_VALID 			0x00100000
 #define		VLAN_RW_UNTAG_SHIFT_5395	9
 #define		VLAN_RW_UNTAG_SHIFT_5380	13
 #define		VLAN_RW_UNTAG_SHIFT_5350	6