Skip to content

Commit 5d294fc

Browse files
arndbdavem330
authored andcommitted
net: dsa: sja1105: improve NET_DSA_SJA1105_TAS dependency
An earlier bugfix introduced a dependency on CONFIG_NET_SCH_TAPRIO, but this missed the case of NET_SCH_TAPRIO=m and NET_DSA_SJA1105=y, which still causes a link error: drivers/net/dsa/sja1105/sja1105_tas.o: In function `sja1105_setup_tc_taprio': sja1105_tas.c:(.text+0x5c): undefined reference to `taprio_offload_free' sja1105_tas.c:(.text+0x3b4): undefined reference to `taprio_offload_get' drivers/net/dsa/sja1105/sja1105_tas.o: In function `sja1105_tas_teardown': sja1105_tas.c:(.text+0x6ec): undefined reference to `taprio_offload_free' Change the dependency to only allow selecting the TAS code when it can link against the taprio code. Fixes: a8d570d ("net: dsa: sja1105: Add dependency for NET_DSA_SJA1105_TAS") Fixes: 317ab5b ("net: dsa: sja1105: Configure the Time-Aware Scheduler via tc-taprio offload") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 88824e3 commit 5d294fc

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/dsa/sja1105/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ config NET_DSA_SJA1105_PTP
2626

2727
config NET_DSA_SJA1105_TAS
2828
bool "Support for the Time-Aware Scheduler on NXP SJA1105"
29-
depends on NET_DSA_SJA1105
30-
depends on NET_SCH_TAPRIO
29+
depends on NET_DSA_SJA1105 && NET_SCH_TAPRIO
30+
depends on NET_SCH_TAPRIO=y || NET_DSA_SJA1105=m
3131
help
3232
This enables support for the TTEthernet-based egress scheduling
3333
engine in the SJA1105 DSA driver, which is controlled using a

0 commit comments

Comments
 (0)