Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/forcedeth.c

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 6a454476bb17..870d44992c70 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -1288,6 +1288,11 @@ void t3_link_fault(struct adapter *adapter, int port_id)
                                  A_XGM_INT_STATUS + mac->offset);
         link_fault &= F_LINKFAULTCHANGE;
 
+        link_ok = lc->link_ok;
+        speed = lc->speed;
+        duplex = lc->duplex;
+        fc = lc->fc;
+
         phy->ops->get_link_status(phy, &link_ok, &speed, &duplex, &fc);
 
         if (link_fault) {