Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2018-09-04 21:33:03 -07:00
parent 2fc4aa59ab 28619527b8
commit 36302685f5
239 changed files with 2428 additions and 1390 deletions
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -4876,8 +4876,8 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator);
 *
 * Return: 0 on success. -ENODATA.
 */
-int reg_query_regdb_wmm(char *alpha2, int freq, u32 *ptr,
-			struct ieee80211_wmm_rule *rule);
+int reg_query_regdb_wmm(char *alpha2, int freq,
+			struct ieee80211_reg_rule *rule);

 /*
 * callbacks for asynchronous cfg80211 methods, notification