openwrt-mirror/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2025-12-21 19:14:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #962 from mrnuke/batfix

Browse Source 
batman-adv: fix compilation bug in batadv_is_cfg80211_netdev()
This commit is contained in:
Simon Wunderlich
2023-04-11 11:21:38 +02:00
committed by GitHub
parent 1b063f315e 2eb71d7d7a
commit 8fe743c2a1
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
batman-adv/patches/0005-fix-batadv_is_cfg80211_netdev.patch Normal file
View 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;