Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4fe9781 authored by Richard Cochran's avatar Richard Cochran Committed by Amit Pundir
Browse files

BACKPORT: igb: convert to CYCLECOUNTER_MASK macro. 



commit b57c894040893da41085334d31f159df94c814b4 upstream.

Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Change-Id: I2c1c714010737051deb1202aa140871c067fa6d5
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent fbb32aea

drivers/net/ethernet/intel/igb/igb_ptp.c

+2 −2
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ void igb_ptp_init(struct igb_adapter *adapter) 
		adapter->ptp_caps.settime = igb_ptp_settime_82576;

		adapter->ptp_caps.enable = igb_ptp_feature_enable;

		adapter->cc.read = igb_ptp_read_82576;

		adapter->cc.mask = CLOCKSOURCE_MASK(64);

		adapter->cc.mask = CYCLECOUNTER_MASK(64);

		adapter->cc.mult = 1;

		adapter->cc.shift = IGB_82576_TSYNC_SHIFT;

		/* Dial the nominal frequency. */
@@ -790,7 +790,7 @@ void igb_ptp_init(struct igb_adapter *adapter) 
		adapter->ptp_caps.settime = igb_ptp_settime_82576;

		adapter->ptp_caps.enable = igb_ptp_feature_enable;

		adapter->cc.read = igb_ptp_read_82580;

		adapter->cc.mask = CLOCKSOURCE_MASK(IGB_NBITS_82580);

		adapter->cc.mask = CYCLECOUNTER_MASK(IGB_NBITS_82580);

		adapter->cc.mult = 1;

		adapter->cc.shift = 0;

		/* Enable the timer functions by clearing bit 31. */