diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-17 15:49:59 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-17 15:49:59 -0800 |
commit | 30472908d50cf726a68c2b444127a1dafae8a91c (patch) | |
tree | 6277cdad2fe6949b9c7aa160e1de435fe367f18e /drivers/net/niu.c | |
parent | abde3dff2496d9d44a218cf8e2a17c2383f20b22 (diff) | |
parent | e415e6ea0cd36ece29c7b12232286b5ca097ac96 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[NIU]: Fix 1G PHY link state handling.
[NET]: Fix TX timeout regression in Intel drivers.
Diffstat (limited to 'drivers/net/niu.c')
-rw-r--r-- | drivers/net/niu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 3bbcea11329..5f6beabf2d1 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c @@ -1319,6 +1319,7 @@ static int link_status_10g(struct niu *np, int *link_up_p) static int link_status_1g(struct niu *np, int *link_up_p) { + struct niu_link_config *lp = &np->link_config; u16 current_speed, bmsr; unsigned long flags; u8 current_duplex; @@ -1386,6 +1387,8 @@ static int link_status_1g(struct niu *np, int *link_up_p) link_up = 0; } } + lp->active_speed = current_speed; + lp->active_duplex = current_duplex; err = 0; out: |