diff options
| author | Göran Weinholt <weinholt@csbnet.se> | 2011-03-01 23:07:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-07 15:30:12 -0500 |
| commit | f277e65e7a2d360189f760baca42f3ca2f62dd7a (patch) | |
| tree | 6d6cdfe42ad1b7b687ed18d870db95af4982bd1b /drivers/net/smsc911x.c | |
| parent | 9b3de1ef1ba0aa1129a9f857f07a6a97d954c6fd (diff) | |
net/smsc911x.c: Set the VLAN1 register to fix VLAN MTU problem
The smsc911x driver would drop frames longer than 1518 bytes, which is a
problem for networks with VLAN tagging. The VLAN1 tag register is used
to increase the legal frame size to 1522 when a VLAN tag is identified.
Signed-off-by: Göran Weinholt <weinholt@csbnet.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/smsc911x.c')
| -rw-r--r-- | drivers/net/smsc911x.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 64bfdae5956..d70bde95460 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -1178,6 +1178,11 @@ static int smsc911x_open(struct net_device *dev) | |||
| 1178 | smsc911x_reg_write(pdata, HW_CFG, 0x00050000); | 1178 | smsc911x_reg_write(pdata, HW_CFG, 0x00050000); |
| 1179 | smsc911x_reg_write(pdata, AFC_CFG, 0x006E3740); | 1179 | smsc911x_reg_write(pdata, AFC_CFG, 0x006E3740); |
| 1180 | 1180 | ||
| 1181 | /* Increase the legal frame size of VLAN tagged frames to 1522 bytes */ | ||
| 1182 | spin_lock_irq(&pdata->mac_lock); | ||
| 1183 | smsc911x_mac_write(pdata, VLAN1, ETH_P_8021Q); | ||
| 1184 | spin_unlock_irq(&pdata->mac_lock); | ||
| 1185 | |||
| 1181 | /* Make sure EEPROM has finished loading before setting GPIO_CFG */ | 1186 | /* Make sure EEPROM has finished loading before setting GPIO_CFG */ |
| 1182 | timeout = 50; | 1187 | timeout = 50; |
| 1183 | while ((smsc911x_reg_read(pdata, E2P_CMD) & E2P_CMD_EPC_BUSY_) && | 1188 | while ((smsc911x_reg_read(pdata, E2P_CMD) & E2P_CMD_EPC_BUSY_) && |