diff mbox series

[2/3] staging: rtlwifi: add MAC80211 dependency

Message ID 20170823132337.517466-2-arnd@arndb.de
State Accepted
Commit 89ff9d58e6b61bc90638157ae9ec21f6e3186a5a
Headers show
Series None | expand

Commit Message

Arnd Bergmann Aug. 23, 2017, 1:22 p.m. UTC
Like the version in drivers/net/wireless, this driver requires the
MAC80211 framework, otherwise we run into a link error:

ERROR: "ieee80211_rx_irqsafe" [drivers/staging/rtlwifi/r8822be.ko] undefined!
ERROR: "cfg80211_unlink_bss" [drivers/staging/rtlwifi/r8822be.ko] undefined!
ERROR: "ieee80211_beacon_get_tim" [drivers/staging/rtlwifi/r8822be.ko] undefined!
ERROR: "ieee80211_resume_disconnect" [drivers/staging/rtlwifi/r8822be.ko] undefined!

This adds the Kconfig dependency for it.

Fixes: 56bde846304e ("staging: r8822be: Add existing rtlwifi and rtl_pci parts for new driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/staging/rtlwifi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.0

Comments

Randy Dunlap Aug. 23, 2017, 3:44 p.m. UTC | #1
On 08/23/2017 06:22 AM, Arnd Bergmann wrote:
> Like the version in drivers/net/wireless, this driver requires the

> MAC80211 framework, otherwise we run into a link error:

> 

> ERROR: "ieee80211_rx_irqsafe" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> ERROR: "cfg80211_unlink_bss" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> ERROR: "ieee80211_beacon_get_tim" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> ERROR: "ieee80211_resume_disconnect" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> 

> This adds the Kconfig dependency for it.


Greg,
Please take this patch instead of my patch from yesterday.

Thanks.

> Fixes: 56bde846304e ("staging: r8822be: Add existing rtlwifi and rtl_pci parts for new driver")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/staging/rtlwifi/Kconfig | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/staging/rtlwifi/Kconfig b/drivers/staging/rtlwifi/Kconfig

> index fc482b49f9aa..cb3a29ae764b 100644

> --- a/drivers/staging/rtlwifi/Kconfig

> +++ b/drivers/staging/rtlwifi/Kconfig

> @@ -1,6 +1,6 @@

>  config R8822BE

>  	tristate "Realtek RTL8822BE Wireless Network Adapter"

> -	depends on PCI && m

> +	depends on PCI && MAC80211 && m

>  	select FW_LOADER

>  	---help---

>  	This is the staging driver for Realtek RTL8822BE 802.11ac PCIe

> 



-- 
~Randy
Greg KH Aug. 23, 2017, 11:19 p.m. UTC | #2
On Wed, Aug 23, 2017 at 08:44:46AM -0700, Randy Dunlap wrote:
> On 08/23/2017 06:22 AM, Arnd Bergmann wrote:

> > Like the version in drivers/net/wireless, this driver requires the

> > MAC80211 framework, otherwise we run into a link error:

> > 

> > ERROR: "ieee80211_rx_irqsafe" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > ERROR: "cfg80211_unlink_bss" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > ERROR: "ieee80211_beacon_get_tim" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > ERROR: "ieee80211_resume_disconnect" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > 

> > This adds the Kconfig dependency for it.

> 

> Greg,

> Please take this patch instead of my patch from yesterday.


Ick, already took that one :(
Greg KH Aug. 23, 2017, 11:29 p.m. UTC | #3
On Wed, Aug 23, 2017 at 04:19:08PM -0700, Greg Kroah-Hartman wrote:
> On Wed, Aug 23, 2017 at 08:44:46AM -0700, Randy Dunlap wrote:

> > On 08/23/2017 06:22 AM, Arnd Bergmann wrote:

> > > Like the version in drivers/net/wireless, this driver requires the

> > > MAC80211 framework, otherwise we run into a link error:

> > > 

> > > ERROR: "ieee80211_rx_irqsafe" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > > ERROR: "cfg80211_unlink_bss" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > > ERROR: "ieee80211_beacon_get_tim" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > > ERROR: "ieee80211_resume_disconnect" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > > 

> > > This adds the Kconfig dependency for it.

> > 

> > Greg,

> > Please take this patch instead of my patch from yesterday.

> 

> Ick, already took that one :(


Fixed it up by hand now, all should be good.
Larry Finger Aug. 24, 2017, 7:23 p.m. UTC | #4
On 08/23/2017 08:22 AM, Arnd Bergmann wrote:
> Like the version in drivers/net/wireless, this driver requires the

> MAC80211 framework, otherwise we run into a link error:

> 

> ERROR: "ieee80211_rx_irqsafe" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> ERROR: "cfg80211_unlink_bss" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> ERROR: "ieee80211_beacon_get_tim" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> ERROR: "ieee80211_resume_disconnect" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> 

> This adds the Kconfig dependency for it.

> 

> Fixes: 56bde846304e ("staging: r8822be: Add existing rtlwifi and rtl_pci parts for new driver")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


Greg,

I lost track of which version of this patch you are taking. The one that Randy 
Dunlap sent that added NETDEVICES was better than the initial version, but this 
one with MAC80211 is the correct one. Randy's patch is in the latest pull I did 
on staging.

Do you want an updated patch?

Larry

> ---

>   drivers/staging/rtlwifi/Kconfig | 2 +-

>   1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/staging/rtlwifi/Kconfig b/drivers/staging/rtlwifi/Kconfig

> index fc482b49f9aa..cb3a29ae764b 100644

> --- a/drivers/staging/rtlwifi/Kconfig

> +++ b/drivers/staging/rtlwifi/Kconfig

> @@ -1,6 +1,6 @@

>   config R8822BE

>   	tristate "Realtek RTL8822BE Wireless Network Adapter"

> -	depends on PCI && m

> +	depends on PCI && MAC80211 && m

>   	select FW_LOADER

>   	---help---

>   	This is the staging driver for Realtek RTL8822BE 802.11ac PCIe

>
Greg KH Aug. 24, 2017, 11:59 p.m. UTC | #5
On Thu, Aug 24, 2017 at 02:23:08PM -0500, Larry Finger wrote:
> On 08/23/2017 08:22 AM, Arnd Bergmann wrote:

> > Like the version in drivers/net/wireless, this driver requires the

> > MAC80211 framework, otherwise we run into a link error:

> > 

> > ERROR: "ieee80211_rx_irqsafe" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > ERROR: "cfg80211_unlink_bss" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > ERROR: "ieee80211_beacon_get_tim" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > ERROR: "ieee80211_resume_disconnect" [drivers/staging/rtlwifi/r8822be.ko] undefined!

> > 

> > This adds the Kconfig dependency for it.

> > 

> > Fixes: 56bde846304e ("staging: r8822be: Add existing rtlwifi and rtl_pci parts for new driver")

> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> 

> Greg,

> 

> I lost track of which version of this patch you are taking. The one that

> Randy Dunlap sent that added NETDEVICES was better than the initial version,

> but this one with MAC80211 is the correct one. Randy's patch is in the

> latest pull I did on staging.

> 

> Do you want an updated patch?


Nope, all should be good now, I've fixed it by hand.  Look in my tree
and if it's still wrong there, please send me a fixup.

thanks,

greg k-h
diff mbox series

Patch

diff --git a/drivers/staging/rtlwifi/Kconfig b/drivers/staging/rtlwifi/Kconfig
index fc482b49f9aa..cb3a29ae764b 100644
--- a/drivers/staging/rtlwifi/Kconfig
+++ b/drivers/staging/rtlwifi/Kconfig
@@ -1,6 +1,6 @@ 
 config R8822BE
 	tristate "Realtek RTL8822BE Wireless Network Adapter"
-	depends on PCI && m
+	depends on PCI && MAC80211 && m
 	select FW_LOADER
 	---help---
 	This is the staging driver for Realtek RTL8822BE 802.11ac PCIe