---

yaml --- r: 233879 b: refs/heads/master c: f277e65 h: refs/heads/master i: 233877: b45cb7c 233875: 01234c4 233871: 3d2a475 v: v3
git-mirror · Mar 7, 2011 · 6aa2b5c · 6aa2b5c
1 parent a83fba5
commit 6aa2b5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b3de1ef1ba0aa1129a9f857f07a6a97d954c6fd
+refs/heads/master: f277e65e7a2d360189f760baca42f3ca2f62dd7a
diff --git a/trunk/drivers/net/smsc911x.c b/trunk/drivers/net/smsc911x.c
@@ -1178,6 +1178,11 @@ static int smsc911x_open(struct net_device *dev)
 	smsc911x_reg_write(pdata, HW_CFG, 0x00050000);
 	smsc911x_reg_write(pdata, AFC_CFG, 0x006E3740);
 
+	/* Increase the legal frame size of VLAN tagged frames to 1522 bytes */
+	spin_lock_irq(&pdata->mac_lock);
+	smsc911x_mac_write(pdata, VLAN1, ETH_P_8021Q);
+	spin_unlock_irq(&pdata->mac_lock);
+
 	/* Make sure EEPROM has finished loading before setting GPIO_CFG */
 	timeout = 50;
 	while ((smsc911x_reg_read(pdata, E2P_CMD) & E2P_CMD_EPC_BUSY_) &&