From 0f17b2a1ea19e33a81948da149718040bea4f159 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 28 Sep 2021 16:00:41 +0200 Subject: [PATCH] drop queue-5.14/igc-fix-build-errors-for-ptp.patch --- queue-5.14/igc-fix-build-errors-for-ptp.patch | 68 ------------------- queue-5.14/series | 1 - 2 files changed, 69 deletions(-) delete mode 100644 queue-5.14/igc-fix-build-errors-for-ptp.patch diff --git a/queue-5.14/igc-fix-build-errors-for-ptp.patch b/queue-5.14/igc-fix-build-errors-for-ptp.patch deleted file mode 100644 index dd4f8412be2..00000000000 --- a/queue-5.14/igc-fix-build-errors-for-ptp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From b0109b74618c35b48f2aed1d456a3141bba02ea3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 17 Sep 2021 14:05:47 -0700 -Subject: igc: fix build errors for PTP - -From: Randy Dunlap - -[ Upstream commit 87758511075ec961486fe78d7548dd709b524433 ] - -When IGC=y and PTP_1588_CLOCK=m, the ptp_*() interface family is -not available to the igc driver. Make this driver depend on -PTP_1588_CLOCK_OPTIONAL so that it will build without errors. - -Various igc commits have used ptp_*() functions without checking -that PTP_1588_CLOCK is enabled. Fix all of these here. - -Fixes these build errors: - -ld: drivers/net/ethernet/intel/igc/igc_main.o: in function `igc_msix_other': -igc_main.c:(.text+0x6494): undefined reference to `ptp_clock_event' -ld: igc_main.c:(.text+0x64ef): undefined reference to `ptp_clock_event' -ld: igc_main.c:(.text+0x6559): undefined reference to `ptp_clock_event' -ld: drivers/net/ethernet/intel/igc/igc_ethtool.o: in function `igc_ethtool_get_ts_info': -igc_ethtool.c:(.text+0xc7a): undefined reference to `ptp_clock_index' -ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_feature_enable_i225': -igc_ptp.c:(.text+0x330): undefined reference to `ptp_find_pin' -ld: igc_ptp.c:(.text+0x36f): undefined reference to `ptp_find_pin' -ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_init': -igc_ptp.c:(.text+0x11cd): undefined reference to `ptp_clock_register' -ld: drivers/net/ethernet/intel/igc/igc_ptp.o: in function `igc_ptp_stop': -igc_ptp.c:(.text+0x12dd): undefined reference to `ptp_clock_unregister' -ld: drivers/platform/x86/dell/dell-wmi-privacy.o: in function `dell_privacy_wmi_probe': - -Fixes: 64433e5bf40ab ("igc: Enable internal i225 PPS") -Fixes: 60dbede0c4f3d ("igc: Add support for ethtool GET_TS_INFO command") -Fixes: 87938851b6efb ("igc: enable auxiliary PHC functions for the i225") -Fixes: 5f2958052c582 ("igc: Add basic skeleton for PTP") -Signed-off-by: Randy Dunlap -Cc: Ederson de Souza -Cc: Tony Nguyen -Cc: Vinicius Costa Gomes -Cc: Jeff Kirsher -Cc: "David S. Miller" -Cc: Jakub Kicinski -Cc: Jesse Brandeburg -Cc: intel-wired-lan@lists.osuosl.org -Acked-by: Vinicius Costa Gomes -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - drivers/net/ethernet/intel/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig -index 82744a7501c7..c11d974a62d8 100644 ---- a/drivers/net/ethernet/intel/Kconfig -+++ b/drivers/net/ethernet/intel/Kconfig -@@ -335,6 +335,7 @@ config IGC - tristate "Intel(R) Ethernet Controller I225-LM/I225-V support" - default n - depends on PCI -+ depends on PTP_1588_CLOCK_OPTIONAL - help - This driver supports Intel(R) Ethernet Controller I225-LM/I225-V - family of adapters. --- -2.33.0 - diff --git a/queue-5.14/series b/queue-5.14/series index 5225aaed3d3..62f089cebb9 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -55,7 +55,6 @@ nlm-fix-svcxdr_encode_owner.patch virtio-net-fix-pages-leaking-when-building-skb-in-bi.patch enetc-fix-illegal-access-when-reading-affinity_hint.patch enetc-fix-uninitialized-struct-dim_sample-field-usag.patch -igc-fix-build-errors-for-ptp.patch net-dsa-tear-down-devlink-port-regions-when-tearing-.patch net-bgmac-bcma-handle-deferred-probe-error-due-to-ma.patch napi-fix-race-inside-napi_enable.patch -- 2.47.3