| Message ID | 20180315165050.2211236-1-arnd@arndb.de |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [v2] Bluetooth: btrsi: rework dependencies | expand |
Hi Arnd, > The linkage between the bluetooth driver and the wireless > driver is not defined properly, leading to build problems > such as: > > warning: (BT_HCIRSI) selects RSI_COEX which has unmet direct dependencies (NETDEVICES && WLAN && WLAN_VENDOR_RSI && BT_HCIRSI && RSI_91X) > drivers/net/wireless/rsi/rsi_91x_main.o: In function `rsi_read_pkt': > (.text+0x205): undefined reference to `rsi_bt_ops' > > As the dependency is actually the reverse (RSI_91X uses > the BT_RSI driver, not the other way round), this changes > the dependency to match, and enables the bluetooth driver > from the RSI_COEX symbol. > > Fixes: 38aa4da50483 ("Bluetooth: btrsi: add new rsi bluetooth driver") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > v2: Pick a different from v1 > --- > drivers/bluetooth/Kconfig | 4 +--- > drivers/net/wireless/rsi/Kconfig | 4 +++- > 2 files changed, 4 insertions(+), 4 deletions(-) Acked-by: Marcel Holtmann <marcel@holtmann.org> Since I think Kalle still has to take it through his tree until the btrsi driver makes it into net-next. Regards Marcel
On Thu, Mar 15, 2018 at 7:30 PM, Marcel Holtmann <marcel@holtmann.org> wrote: > Hi Arnd, > >> The linkage between the bluetooth driver and the wireless >> driver is not defined properly, leading to build problems >> such as: >> >> warning: (BT_HCIRSI) selects RSI_COEX which has unmet direct dependencies (NETDEVICES && WLAN && WLAN_VENDOR_RSI && BT_HCIRSI && RSI_91X) >> drivers/net/wireless/rsi/rsi_91x_main.o: In function `rsi_read_pkt': >> (.text+0x205): undefined reference to `rsi_bt_ops' >> >> As the dependency is actually the reverse (RSI_91X uses >> the BT_RSI driver, not the other way round), this changes >> the dependency to match, and enables the bluetooth driver >> from the RSI_COEX symbol. >> >> Fixes: 38aa4da50483 ("Bluetooth: btrsi: add new rsi bluetooth driver") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> --- >> v2: Pick a different from v1 >> --- >> drivers/bluetooth/Kconfig | 4 +--- >> drivers/net/wireless/rsi/Kconfig | 4 +++- >> 2 files changed, 4 insertions(+), 4 deletions(-) > > Acked-by: Marcel Holtmann <marcel@holtmann.org> > > Since I think Kalle still has to take it through his tree until the btrsi driver makes it into net-next. Ok. Kalle, please wait for v3 though, I just ran into another build failure caused by a typo in v2. Arnd
Arnd Bergmann <arnd@arndb.de> writes: > On Thu, Mar 15, 2018 at 7:30 PM, Marcel Holtmann <marcel@holtmann.org> wrote: >> Hi Arnd, >> >>> The linkage between the bluetooth driver and the wireless >>> driver is not defined properly, leading to build problems >>> such as: >>> >>> warning: (BT_HCIRSI) selects RSI_COEX which has unmet direct >>> dependencies (NETDEVICES && WLAN && WLAN_VENDOR_RSI && BT_HCIRSI && >>> RSI_91X) >>> drivers/net/wireless/rsi/rsi_91x_main.o: In function `rsi_read_pkt': >>> (.text+0x205): undefined reference to `rsi_bt_ops' >>> >>> As the dependency is actually the reverse (RSI_91X uses >>> the BT_RSI driver, not the other way round), this changes >>> the dependency to match, and enables the bluetooth driver >>> from the RSI_COEX symbol. >>> >>> Fixes: 38aa4da50483 ("Bluetooth: btrsi: add new rsi bluetooth driver") >>> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >>> --- >>> v2: Pick a different from v1 >>> --- >>> drivers/bluetooth/Kconfig | 4 +--- >>> drivers/net/wireless/rsi/Kconfig | 4 +++- >>> 2 files changed, 4 insertions(+), 4 deletions(-) >> >> Acked-by: Marcel Holtmann <marcel@holtmann.org> >> >> Since I think Kalle still has to take it through his tree until the >> btrsi driver makes it into net-next. Yes, I have to take this as I haven't sent the original patch to Dave yet. > Kalle, please wait for v3 though, I just ran into another build > failure caused by a typo in v2. Ok, I saw it.
diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig index d8bbd661dbdb..149a38ee1fce 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -393,9 +393,7 @@ config BT_QCOMSMD kernel or say M to compile as a module. config BT_HCIRSI - tristate "Redpine HCI support" - default n - select RSI_COEX + tristate help Redpine BT driver. This driver handles BT traffic from upper layers and pass diff --git a/drivers/net/wireless/rsi/Kconfig b/drivers/net/wireless/rsi/Kconfig index f004be33fcfa..c6006fab8638 100644 --- a/drivers/net/wireless/rsi/Kconfig +++ b/drivers/net/wireless/rsi/Kconfig @@ -13,6 +13,7 @@ if WLAN_VENDOR_RSI config RSI_91X tristate "Redpine Signals Inc 91x WLAN driver support" + select BT_RSI if RSI_COEX depends on MAC80211 ---help--- This option enabes support for RSI 1x1 devices. @@ -44,7 +45,8 @@ config RSI_USB config RSI_COEX bool "Redpine Signals WLAN BT Coexistence support" - depends on BT_HCIRSI && RSI_91X + depends on BT && RSI_91X + depends on !(BT=m && RSI_91X=y) default y ---help--- This option enables the WLAN BT coex support in rsi drivers.
The linkage between the bluetooth driver and the wireless driver is not defined properly, leading to build problems such as: warning: (BT_HCIRSI) selects RSI_COEX which has unmet direct dependencies (NETDEVICES && WLAN && WLAN_VENDOR_RSI && BT_HCIRSI && RSI_91X) drivers/net/wireless/rsi/rsi_91x_main.o: In function `rsi_read_pkt': (.text+0x205): undefined reference to `rsi_bt_ops' As the dependency is actually the reverse (RSI_91X uses the BT_RSI driver, not the other way round), this changes the dependency to match, and enables the bluetooth driver from the RSI_COEX symbol. Fixes: 38aa4da50483 ("Bluetooth: btrsi: add new rsi bluetooth driver") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- v2: Pick a different from v1 --- drivers/bluetooth/Kconfig | 4 +--- drivers/net/wireless/rsi/Kconfig | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-)