summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShannon Nelson <snelson@pensando.io>2021-05-11 11:11:32 -0700
committerDavid S. Miller <davem@davemloft.net>2021-05-11 16:20:27 -0700
commitbcbda3fc616272686208f9c4d5f6dccb65360bd8 (patch)
tree79cc8ac9fe29374940107e2f1f333bd5cb8c9f71
parent29249eac5225429b898f278230a6ca2baa1ae154 (diff)
downloadlinux-stable-bcbda3fc616272686208f9c4d5f6dccb65360bd8.tar.gz
linux-stable-bcbda3fc616272686208f9c4d5f6dccb65360bd8.tar.bz2
linux-stable-bcbda3fc616272686208f9c4d5f6dccb65360bd8.zip
ionic: fix ptp support config breakage
When IONIC=y and PTP_1588_CLOCK=m were set in the .config file the driver link failed with undefined references. We add the dependancy depends on PTP_1588_CLOCK || !PTP_1588_CLOCK to clear this up. If PTP_1588_CLOCK=m, the depends limits IONIC to =m (or disabled). If PTP_1588_CLOCK is disabled, IONIC can be any of y/m/n. Fixes: 61db421da31b ("ionic: link in the new hw timestamp code") Reported-by: kernel test robot <lkp@intel.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Randy Dunlap <rdunlap@infradead.org> Cc: Allen Hubbe <allenbh@pensando.io> Signed-off-by: Shannon Nelson <snelson@pensando.io> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/pensando/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/pensando/Kconfig b/drivers/net/ethernet/pensando/Kconfig
index 5f8b0bb3af6e..202973a82712 100644
--- a/drivers/net/ethernet/pensando/Kconfig
+++ b/drivers/net/ethernet/pensando/Kconfig
@@ -20,6 +20,7 @@ if NET_VENDOR_PENSANDO
config IONIC
tristate "Pensando Ethernet IONIC Support"
depends on 64BIT && PCI
+ depends on PTP_1588_CLOCK || !PTP_1588_CLOCK
select NET_DEVLINK
select DIMLIB
help