瀏覽代碼

qcacmn: Add backport flag support for netdev registration

Add backport flag support for enabling cfg80211 netdev
registration APIs.

Change-Id: Id76c938deb54837de85fbf3438c70a9b509adac8
CRs-Fixed: 3589954
Arun Kumar Khandavalli 1 年之前
父節點
當前提交
0979038391
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 4 2
      os_if/linux/wlan_cfg80211.h
  2. 1 3
      os_if/linux/wlan_osif_features.h

+ 4 - 2
os_if/linux/wlan_cfg80211.h

@@ -584,7 +584,8 @@ wlan_cfg80211_nla_strscpy(char *dst, const struct nlattr *nla, size_t dstsize)
 }
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0) || \
+	(defined CFG80211_CHANGE_NETDEV_REGISTRATION_SEMANTICS))
 static inline int wlan_cfg80211_register_netdevice(struct net_device *dev)
 {
 	return cfg80211_register_netdevice(dev);
@@ -596,7 +597,8 @@ static inline int wlan_cfg80211_register_netdevice(struct net_device *dev)
 }
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 12, 0) || \
+	(defined CFG80211_CHANGE_NETDEV_REGISTRATION_SEMANTICS))
 static inline void wlan_cfg80211_unregister_netdevice(struct net_device *dev)
 {
 	cfg80211_unregister_netdevice(dev);

+ 1 - 3
os_if/linux/wlan_osif_features.h

@@ -302,9 +302,7 @@
  * https://android-review.googlesource.com/c/kernel/common/+/2470891
  */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0) || \
-	(defined(__ANDROID_COMMON_KERNEL__) && \
-	(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)) && \
-	(defined CFG80211_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT)))
+	(defined CFG80211_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT))
 #define WLAN_MLD_AP_STA_CONNECT_UPSTREAM_SUPPORT 1
 #endif