Merge pull request #962 from mrnuke/batfix
batman-adv: fix compilation bug in batadv_is_cfg80211_netdev()
This commit is contained in:
commit
8fe743c2a1
1 changed files with 19 additions and 0 deletions
19
batman-adv/patches/0005-fix-batadv_is_cfg80211_netdev.patch
Normal file
19
batman-adv/patches/0005-fix-batadv_is_cfg80211_netdev.patch
Normal file
|
@ -0,0 +1,19 @@
|
|||
From: Alexandru Gagniuc <mr.nuke.me@gmail.com>
|
||||
Date: Thu, 6 Apr 2023 18:05:50 -0500
|
||||
Subject: fix batadv_is_cfg80211_netdev
|
||||
|
||||
Replace CONFIG_CFG80211 with CPTCFG_CFG80211, which is the correct
|
||||
macro to use when building under backports.
|
||||
|
||||
--- a/net/batman-adv/hard-interface.c
|
||||
+++ b/net/batman-adv/hard-interface.c
|
||||
@@ -307,8 +307,7 @@ static bool batadv_is_cfg80211_netdev(st
|
||||
{
|
||||
if (!net_device)
|
||||
return false;
|
||||
-
|
||||
-#if IS_ENABLED(CONFIG_CFG80211)
|
||||
+#if IS_ENABLED(CPTCFG_CFG80211)
|
||||
/* cfg80211 drivers have to set ieee80211_ptr */
|
||||
if (net_device->ieee80211_ptr)
|
||||
return true;
|
Loading…
Reference in a new issue