diff options
| author | Jacob Keller <[email protected]> | 2016-05-24 20:56:29 +0000 |
|---|---|---|
| committer | Jeff Kirsher <[email protected]> | 2016-06-29 17:56:11 +0000 |
| commit | 4f3ce71bb8d9c7591f25d3d8315249a250d208f0 (patch) | |
| tree | 52271b5cfe73113d2aa3e913b37cf2249d67e233 /drivers/net/ethernet/intel/igb/igb_main.c | |
| parent | igb: introduce IGB_PTP_OVERFLOW_CHECK flag (diff) | |
| download | kernel-4f3ce71bb8d9c7591f25d3d8315249a250d208f0.tar.gz kernel-4f3ce71bb8d9c7591f25d3d8315249a250d208f0.zip | |
igb: re-use igb_ptp_reset in igb_ptp_init
Modify igb_ptp_init to take advantage of igb_ptp_reset, and remove
duplicated work that was occurring in both igb_ptp_reset and
igb_ptp_init.
In total, resetting the TSAUXC register, and resetting the system time
both happen in igb_ptp_reset already. igb_ptp_reset now also takes care
of starting the delayed work item for overflow checks, as well.
Signed-off-by: Jacob Keller <[email protected]>
Tested-by: Aaron Brown <[email protected]>
Signed-off-by: Jeff Kirsher <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index ef3d642f5ff2..750a5d865c9f 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2027,7 +2027,8 @@ void igb_reset(struct igb_adapter *adapter) wr32(E1000_VET, ETHERNET_IEEE_VLAN_TYPE); /* Re-enable PTP, where applicable. */ - igb_ptp_reset(adapter); + if (adapter->ptp_flags & IGB_PTP_ENABLED) + igb_ptp_reset(adapter); igb_get_phy_info(hw); } |