summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/0027-genl-const/nl80211.patch')
-rw-r--r--patches/collateral-evolutions/network/0027-genl-const/nl80211.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
index 59dbd0c8..345853ef 100644
--- a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
+++ b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
@@ -1,6 +1,6 @@
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
-@@ -30,9 +30,9 @@ static int nl80211_crypto_settings(struc
+@@ -31,9 +31,9 @@ static int nl80211_crypto_settings(struc
struct cfg80211_crypto_settings *settings,
int cipher_limit);
@@ -12,7 +12,7 @@
struct genl_info *info);
/* the netlink family */
-@@ -57,7 +57,7 @@ enum nl80211_multicast_groups {
+@@ -58,7 +58,7 @@ enum nl80211_multicast_groups {
NL80211_MCGRP_TESTMODE /* keep last - ifdef! */
};
@@ -21,16 +21,16 @@
[NL80211_MCGRP_CONFIG] = { .name = "config", },
[NL80211_MCGRP_SCAN] = { .name = "scan", },
[NL80211_MCGRP_REGULATORY] = { .name = "regulatory", },
-@@ -9380,7 +9380,7 @@ static int nl80211_set_qos_map(struct sk
- #define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\
+@@ -9529,7 +9529,7 @@ static int nl80211_del_tx_ts(struct sk_b
NL80211_FLAG_CHECK_NETDEV_UP)
+ #define NL80211_FLAG_CLEAR_SKB 0x20
-static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
+static int nl80211_pre_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
struct genl_info *info)
{
struct cfg80211_registered_device *rdev;
-@@ -9449,7 +9449,7 @@ static int nl80211_pre_doit(const struct
+@@ -9598,7 +9598,7 @@ static int nl80211_pre_doit(const struct
return 0;
}
@@ -39,8 +39,8 @@
struct genl_info *info)
{
if (info->user_ptr[1]) {
-@@ -9466,7 +9466,7 @@ static void nl80211_post_doit(const stru
- rtnl_unlock();
+@@ -9627,7 +9627,7 @@ static void nl80211_post_doit(const stru
+ }
}
-static const struct genl_ops nl80211_ops[] = {