diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 13:40:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 13:40:40 -0400 |
| commit | db7a89db5e3bc6ba131965183577b15fd6fc92cc (patch) | |
| tree | 3379e5ceced69c41b24c68d571a103b71c246b14 /drivers/net/mv643xx_eth.c | |
| parent | 2910ca6f8ae69648623b3c05b79be87dd7bda73d (diff) | |
| parent | f662fe5a0b144efadbfc00e8040e603ec318746e (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
dm9601: Fix receive MTU
mv643xx_eth: Do not modify struct netdev tx_queue_len
qla3xxx: bugfix: Fix VLAN rx completion handling.
qla3xxx: bugfix: Add memory barrier before accessing rx completion.
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 34288fe038c3..315335671f0f 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -1357,7 +1357,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev) | |||
| 1357 | #endif | 1357 | #endif |
| 1358 | 1358 | ||
| 1359 | dev->watchdog_timeo = 2 * HZ; | 1359 | dev->watchdog_timeo = 2 * HZ; |
| 1360 | dev->tx_queue_len = mp->tx_ring_size; | ||
| 1361 | dev->base_addr = 0; | 1360 | dev->base_addr = 0; |
| 1362 | dev->change_mtu = mv643xx_eth_change_mtu; | 1361 | dev->change_mtu = mv643xx_eth_change_mtu; |
| 1363 | dev->do_ioctl = mv643xx_eth_do_ioctl; | 1362 | dev->do_ioctl = mv643xx_eth_do_ioctl; |