Patchwork pch_gbe: Fix PTP dependencies.

login
register
mail settings
Submitter David Miller
Date Oct. 3, 2012, 2:35 a.m.
Message ID <20121002.223504.1130795240955330652.davem@davemloft.net>
Download mbox | patch
Permalink /patch/188696/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Oct. 3, 2012, 2:35 a.m.
The config combination:

        CONFIG_PCH_GBE=y
        CONFIG_PCH_PTP=y
        CONFIG_PTP_1588_CLOCK=m

doesn't work, because then you have a built-in kernel
object (the PCH_PTP code) referring to symbols in a
module (PTP_1588_CLOCK).

Fix this like IXGBE, by using "select PTP_1588_CLOCK"
instead of a "depends on".

Reported-by: Haicheng Li <haicheng.li@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Richard Cochran - Oct. 5, 2012, 1:04 p.m.
On Tue, Oct 02, 2012 at 10:35:04PM -0400, David Miller wrote:
> 
> The config combination:
> 
>         CONFIG_PCH_GBE=y
>         CONFIG_PCH_PTP=y
>         CONFIG_PTP_1588_CLOCK=m
...
> @@ -26,7 +26,7 @@ if PCH_GBE
>  config PCH_PTP
>  	bool "PCH PTP clock support"
>  	default n
> -	depends on PTP_1588_CLOCK_PCH
> +	select PTP_1588_CLOCK_PCH

Based on Fengguang Wu's complaint, maybe this would work better:

	depends on PTP_1588_CLOCK && !(PCH_GBE=y && PTP_1588_CLOCK=m)

Thanks,
Richard
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index bce0164..9730241 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@ -26,7 +26,7 @@  if PCH_GBE
 config PCH_PTP
 	bool "PCH PTP clock support"
 	default n
-	depends on PTP_1588_CLOCK_PCH
+	select PTP_1588_CLOCK_PCH
 	---help---
 	  Say Y here if you want to use Precision Time Protocol (PTP) in the
 	  driver. PTP is a method to precisely synchronize distributed clocks