summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCNSS_WLAN Service <cnssbldsw@qualcomm.com>2017-09-27 16:55:13 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-27 16:55:13 -0700
commitf7628705aba776af33043b817cd7f79150e21d8a (patch)
treefb1d318f798a76b8e5f33cedbfb9de9192c8f064
parent7bad2f9bae2b2a3ea45a5ae3096a00a572b9672e (diff)
parent23c0e095872c3ecbc4d5702aa1adf0c00dbe7436 (diff)
Merge "qcacld-3.0: Throw error if nla_parse is used directly" into wlan-cld3.driver.lnx.1.1
-rw-r--r--core/hdd/inc/wlan_hdd_main.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index fd60b2ff11f0..83979b10912d 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -2762,6 +2762,7 @@ static inline void hdd_update_hlp_info(struct net_device *dev,
{}
#endif
+#undef nla_parse
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0)
static inline void hdd_dev_setup_destructor(struct net_device *dev)
{
@@ -2801,6 +2802,7 @@ hdd_nla_parse_nested(struct nlattr *tb[], int maxtype, const struct nlattr *nla,
return nla_parse_nested(tb, maxtype, nla, policy, NULL);
}
#endif /* KERNEL_VERSION(4, 12, 0) */
+#define nla_parse(...) (obsolete, use wlan_cfg80211_nla_parse or hdd_nla_parse)
/**
* hdd_pld_ipa_uc_shutdown_pipes() - Disconnect IPA WDI pipes during PDR