Commit da091286 authored by Al Viro's avatar Al Viro Committed by David S. Miller

CONFIG_TR/CONFIG_LLC: work around the problem with select

As it is, with PCI/ISA/MCA/CCW all set to n and PCMCIA set to m
setting TR to y will set LLC to m, with very unpleasant results -
net/802/psnap gets picked into obj-y, resulting in the kernel
that won't link - psnap calls functions from llc.  The cause,
AFAICS, is that kconfig gets rev_dep for LLC containing
|| TR && (deps for TR)
and even though TR is boolean, both LLC and PCMCIA are tristate
and that thing becomes || y && (n || m), i.e. || m.  The reason
for dependency on PCMCIA is that when none of PCI, ISA, MCA, CCW
or PCMCIA is set there'll be no tokenring drivers, so there's no
point building tokenring core.  Proper fix probably belongs in
kconfig (we need strict and, such that y <strict_and> m would be
y, so that rev_deps added for tristate selected by bool would
use that instead of &&; we'd have || TR <strict_and> (deps for TR)
in this case), but it's a rather intrusive change.  There's an
easy workaround in case of TR -> LLC select, namely to have a def_bool y
symbol sitting under if TR and have that symbol selecting LLC.
Kudos to johill for suggesting that one...
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aadf1f0f
...@@ -7,7 +7,6 @@ menuconfig TR ...@@ -7,7 +7,6 @@ menuconfig TR
bool "Token Ring driver support" bool "Token Ring driver support"
depends on NETDEVICES && !UML depends on NETDEVICES && !UML
depends on (PCI || ISA || MCA || CCW || PCMCIA) depends on (PCI || ISA || MCA || CCW || PCMCIA)
select LLC
help help
Token Ring is IBM's way of communication on a local network; the Token Ring is IBM's way of communication on a local network; the
rest of the world uses Ethernet. To participate on a Token Ring rest of the world uses Ethernet. To participate on a Token Ring
...@@ -20,6 +19,10 @@ menuconfig TR ...@@ -20,6 +19,10 @@ menuconfig TR
if TR if TR
config WANT_LLC
def_bool y
select LLC
config PCMCIA_IBMTR config PCMCIA_IBMTR
tristate "IBM PCMCIA tokenring adapter support" tristate "IBM PCMCIA tokenring adapter support"
depends on IBMTR!=y && PCMCIA depends on IBMTR!=y && PCMCIA
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment