diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-26 16:32:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-26 16:32:31 -0700 |
| commit | 13142341ac867bb67e88204cbfcb8d90f9a861b7 (patch) | |
| tree | 7f3881d41696c0a47d871a2289e25e9e9928cd6d /drivers/net | |
| parent | 3fd1bb9baa394856b112e5edbfd3893d92dd1149 (diff) | |
| parent | d4ef16088913002255eab9958fff4e98b3b507d6 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 01419aff333..6d4ab1e333b 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -66,8 +66,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.36" -#define DRV_MODULE_RELDATE "August 19, 2005" +#define DRV_MODULE_VERSION "3.37" +#define DRV_MODULE_RELDATE "August 25, 2005" #define TG3_DEF_MAC_MODE 0 #define TG3_DEF_RX_MODE 0 @@ -7865,8 +7865,6 @@ static int tg3_test_loopback(struct tg3 *tp) err = -EIO; - tg3_abort_hw(tp, 1); - tg3_reset_hw(tp); mac_mode = (tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK) | |