[PATCH net-next] net: ice: ptp: fix compilation warning if PTP_1588_CLOCK is disabled

Subsystems: intel ethernet drivers, networking drivers, the rest

STALE1892d

2 messages, 2 authors, 2021-06-15 · open the first message on its own page

[PATCH net-next] net: ice: ptp: fix compilation warning if PTP_1588_CLOCK is disabled

From: Lorenzo Bianconi <lorenzo@kernel.org>
Date: 2021-06-15 14:15:27

Fix the following compilation warning if PTP_1588_CLOCK is not enabled

drivers/net/ethernet/intel/ice/ice_ptp.h:149:1:
   error: return type defaults to ‘int’ [-Werror=return-type]
   ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb)

Fixes: ea9b847cda647 ("ice: enable transmit timestamps for E810 devices")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
 drivers/net/ethernet/intel/ice/ice_ptp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h b/drivers/net/ethernet/intel/ice/ice_ptp.h
index 41e14f98f0e6..d01507eba036 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.h
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.h
@@ -145,7 +145,7 @@ static inline int ice_get_ptp_clock_index(struct ice_pf *pf)
 	return -1;
 }
 
-static inline
+static inline s8
 ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb)
 {
 	return -1;
-- 
2.31.1

RE: [PATCH net-next] net: ice: ptp: fix compilation warning if PTP_1588_CLOCK is disabled

From: "Keller, Jacob E" <jacob.e.keller@intel.com>
Date: 2021-06-15 19:10:26

-----Original Message-----
From: Lorenzo Bianconi <lorenzo@kernel.org>
Sent: Tuesday, June 15, 2021 7:14 AM
To: netdev@vger.kernel.org
Cc: lorenzo.bianconi@redhat.com; Keller, Jacob E <jacob.e.keller@intel.com>
Subject: [PATCH net-next] net: ice: ptp: fix compilation warning if
PTP_1588_CLOCK is disabled

Fix the following compilation warning if PTP_1588_CLOCK is not enabled

drivers/net/ethernet/intel/ice/ice_ptp.h:149:1:
   error: return type defaults to ‘int’ [-Werror=return-type]
   ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb)

Fixes: ea9b847cda647 ("ice: enable transmit timestamps for E810 devices")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>

Hah. Thanks. This is obviously correct.

Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
quoted hunk
---
 drivers/net/ethernet/intel/ice/ice_ptp.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.h
b/drivers/net/ethernet/intel/ice/ice_ptp.h
index 41e14f98f0e6..d01507eba036 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.h
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.h
@@ -145,7 +145,7 @@ static inline int ice_get_ptp_clock_index(struct ice_pf *pf)
 	return -1;
 }

-static inline
+static inline s8
 ice_ptp_request_ts(struct ice_ptp_tx *tx, struct sk_buff *skb)
 {
 	return -1;
--
2.31.1

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help