[PATCH net-next] net: ptp: oki-semi: fix build dependency

[PATCH net-next] net: ptp: oki-semi: fix build dependency

[Alexei Starovoitov]

fix kbuild test error:
ERROR: "ptp_classify_raw" [drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.ko] undefined!

Fixes: 164d8c666521 ("net: ptp: do not reimplement PTP/BPF classifier")
Cc: Paul Mackerras <paulus@samba.org>
Cc: linux-ppp@vger.kernel.org
Cc: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
---
 drivers/net/ethernet/oki-semi/pch_gbe/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
index a588ffde9700..b6f2ed76f7e4 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
@@ -4,7 +4,7 @@
 
 config PCH_GBE
 	tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE"
-	depends on PCI && (X86 || COMPILE_TEST)
+	depends on PCI && NETWORK_PHY_TIMESTAMPING && (X86 || COMPILE_TEST)
 	select MII
 	select PTP_1588_CLOCK_PCH
 	---help---
-- 
1.7.9.5

Re: [PATCH net-next] net: ptp: oki-semi: fix build dependency

[Richard Cochran]

On Sun, Mar 30, 2014 at 11:32:19PM -0700, Alexei Starovoitov wrote:

> -	depends on PCI && (X86 || COMPILE_TEST)
> +	depends on PCI && NETWORK_PHY_TIMESTAMPING && (X86 || COMPILE_TEST)

This is not the way to fix it.

Enabling NETWORK_PHY_TIMESTAMPING puts extra checks into the hot path
for every skb passed to netif_receive_skb(). It only makes sense to
pay this extra cost if you actually have a time stamping PHY.

So instead, move the classifier routine out of timestamping.c to a
place where it is always compiled into the stack.

Thanks,
Richard