diff mbox

[net-next] bnxt_en: Fix build error for kernesl without RTC-LIB

Message ID 1474356993-5857-1-git-send-email-michael.chan@broadcom.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Michael Chan Sept. 20, 2016, 7:36 a.m. UTC 
From: Rob Swindell <swindell@broadcom.com>

bnxt_hwrm_fw_set_time() now returns -EOPNOTSUPP when built for kernel
without RTC_LIB.  Setting the firmware time is not critical to the
successful completion of the firmware update process.

Signed-off-by: Rob Swindell <Rob.Swindell@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

David Miller Sept. 20, 2016, 7:54 a.m. UTC | #1 
From: Michael Chan <michael.chan@broadcom.com>
Date: Tue, 20 Sep 2016 03:36:33 -0400

> From: Rob Swindell <swindell@broadcom.com>
> 
> bnxt_hwrm_fw_set_time() now returns -EOPNOTSUPP when built for kernel
> without RTC_LIB.  Setting the firmware time is not critical to the
> successful completion of the firmware update process.
> 
> Signed-off-by: Rob Swindell <Rob.Swindell@broadcom.com>
> Signed-off-by: Michael Chan <michael.chan@broadcom.com>

Applied.
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index cbc0b8a..a9f9f37 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -4323,6 +4323,7 @@  hwrm_ver_get_exit:
 
 int bnxt_hwrm_fw_set_time(struct bnxt *bp)
 {
+#if IS_ENABLED(CONFIG_RTC_LIB)
 	struct hwrm_fw_set_time_input req = {0};
 	struct rtc_time tm;
 	struct timeval tv;
@@ -4340,6 +4341,9 @@  int bnxt_hwrm_fw_set_time(struct bnxt *bp)
 	req.minute = tm.tm_min;
 	req.second = tm.tm_sec;
 	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);
+#else
+	return -EOPNOTSUPP;
+#endif
 }
 
 static int bnxt_hwrm_port_qstats(struct bnxt *bp)