From 6aa2b5c3542c2ea62d52cde24c94cf79b21104a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=B6ran=20Weinholt?= Date: Wed, 2 Mar 2011 04:07:21 +0000 Subject: [PATCH] --- yaml --- r: 233879 b: refs/heads/master c: f277e65e7a2d360189f760baca42f3ca2f62dd7a h: refs/heads/master i: 233877: b45cb7c988242286d0b01e36b5318c9cdf3d2057 233875: 01234c48223e2aaca979209ea13718790d25df52 233871: 3d2a475d07930aca3d17bcff89a326cf6e6a0840 v: v3 --- [refs] | 2 +- trunk/drivers/net/smsc911x.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b2725505c680..ceb76791ecfa 100644 --- 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 index 64bfdae5956f..d70bde95460b 100644 --- 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_) &&