From: Johannes Berg johannes.b...@intel.com
The current wireless tree changes the surrounding code to
use the exported string constants, so adjust the patch to
make it apply again.
Signed-off-by: Johannes Berg johannes.b...@intel.com
---
patches/collateral-evolutions/network/0027-genl-const/nl80211.patch | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
index d8d67bb99577..21c2a86eda58 100644
--- a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
+++ b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
@@ -18,9 +18,9 @@
-static const struct genl_multicast_group nl80211_mcgrps[] = {
+static __genl_const struct genl_multicast_group nl80211_mcgrps[] = {
- [NL80211_MCGRP_CONFIG] = { .name = config, },
- [NL80211_MCGRP_SCAN] = { .name = scan, },
- [NL80211_MCGRP_REGULATORY] = { .name = regulatory, },
+ [NL80211_MCGRP_CONFIG] = { .name = NL80211_MULTICAST_GROUP_CONFIG },
+ [NL80211_MCGRP_SCAN] = { .name = NL80211_MULTICAST_GROUP_SCAN },
+ [NL80211_MCGRP_REGULATORY] = { .name = NL80211_MULTICAST_GROUP_REG },
@@ -9938,7 +9938,7 @@ static int nl80211_tdls_cancel_channel_s
NL80211_FLAG_CHECK_NETDEV_UP)
#define NL80211_FLAG_CLEAR_SKB0x20
--
2.1.4
--
To unsubscribe from this list: send the line unsubscribe linux-wireless in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
