diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-10-21 17:19:22 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-10-23 11:11:05 +0200 |
| commit | 68cecfdbe342f800a0b1f10a1f8fb019b491f04b (patch) | |
| tree | 4bf67d73d4e4f6b676d6d21073f4ee9189730aa0 | |
| parent | 0e0456837c33ed7b8c09c75cb9ae8cccc95ce645 (diff) | |
e1000: reduce i210/i211 hack
Now that the FW/SW synchronisation is fixed we can reduce the hack
introduced by the following commit:
02bf24ad4a7c882e25771f656b973d5458695cf0
e1000: i210/i211 hack
Note that we leave one final hack for now required for unprogrammed
i210 operation.
| -rw-r--r-- | drivers/net/e1000.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index c44c63b7c5..ca3d3c7cb2 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -1131,9 +1131,7 @@ e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask) if (!timeout) { DEBUGOUT("Driver can't access resource, SW_FW_SYNC timeout.\n"); -//hack to avoid the following error for now -//e1000: e1000#0: ERROR: Hardware Initialization Failed -// return -E1000_ERR_SWFW_SYNC; + return -E1000_ERR_SWFW_SYNC; } swfw_sync |= swmask; @@ -4383,7 +4381,7 @@ e1000_get_phy_cfg_done(struct e1000_hw *hw) if (!timeout) { DEBUGOUT("MNG configuration cycle has not " "completed.\n"); -//hack to avoid the following error for now +//hack to avoid the following error on unprogrammed i210 for now //e1000: e1000#0: ERROR: Hardware Initialization Failed // return -E1000_ERR_RESET; } |