summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.10/402_bcm63xx_enet_vlan_incoming_fixed.patch
blob: 650ad11c77dfac78b1cc41d1cde6c9a216c0c80c (plain) 
1
2
3
4
5
6
7
8
9
10
11

--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1635,7 +1635,7 @@ static int compute_hw_mtu(struct bcm_ene
 	actual_mtu = mtu;
 
 	/* add ethernet header + vlan tag size */
-	actual_mtu += VLAN_ETH_HLEN;
+	actual_mtu += VLAN_ETH_HLEN + VLAN_HLEN;
 
 	if (actual_mtu < 64 || actual_mtu > BCMENET_MAX_MTU)
 		return -EINVAL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 04:17:46 +0000
color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4450,6 +4450,98 @@ static struct board_info __initdata boar
 	.has_ehci0 = 1,
 };
 
+static struct board_info __initdata board_VR3025u = {
+	.name					= "96368M-1541N",
+	.expected_cpu_id		= 0x6368,
+
+	.has_uart0				= 1,
+	.has_pci				= 1,
+	.has_ohci0				= 1,
+	.has_ehci0				= 1,
+
+	.has_enetsw				= 1,
+	.enetsw = {
+		.used_ports = {
+			[0] = {
+				.used		= 1,
+				.phy_id		= 1,
+				.name		= "port1",
+			},
+			[1] = {
+				.used		= 1,
+				.phy_id		= 2,
+				.name		= "port2",
+			},
+			[2] = {
+				.used		= 1,
+				.phy_id		= 3,
+				.name		= "port3",
+			},
+			[3] = {
+				.used		= 1,
+				.phy_id		= 4,
+				.name		= "port4",
+			},
+		},
+	},
+
+	.leds = {
+		{
+			.name		= "VR-3025u:green:dsl",
+			.gpio		= 2,
+			.active_low	= 1,
+		},
+		{
+			.name		= "VR-3025u:green:inet",
+			.gpio		= 5,
+		},
+		{
+			.name		= "VR-3025u:green:lan1",
+			.gpio		= 6,
+			.active_low	= 1,
+		},
+		{
+			.name		= "VR-3025u:green:lan2",
+			.gpio		= 7,
+			.active_low	= 1,
+		},
+		{
+			.name		= "VR-3025u:green:lan3",
+			.gpio		= 8,
+			.active_low	= 1,
+		},
+		{
+			.name		= "VR-3025u:green:lan4",
+			.gpio		= 9,
+			.active_low	= 1,
+		},
+		{
+			.name		= "VR-3025u:green:power",
+			.gpio		= 22,
+			.default_trigger = "default-on",
+		},
+		{
+			.name		= "VR-3025u:red:power",
+			.gpio		= 24,
+		},
+		{
+			.name		= "VR-3025u:red:inet",
+			.gpio		= 31,
+		},
+	},
+
+	.buttons = {
+		{
+			.desc			= "reset",
+			.gpio			= 34,
+			.type			= EV_KEY,
+			.code			= KEY_RESTART,
+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
+			.active_low		= 1,
+		},
+	},
+};
+
 static struct b53_platform_data WAP5813n_b53_pdata = {
 	.alias = "eth0",
 };
@@ -4925,6 +5017,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
 	&board_96368mvngr,
+	&board_VR3025u,
 	&board_WAP5813n,
 #endif
 #ifdef CONFIG_BCM63XX_CPU_63268
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 04:17:46 +0000