* [PATCH] backports: update genl-const patch for nl80211
@ 2015-01-30 17:35 Johannes Berg
2015-01-30 17:44 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2015-01-30 17:35 UTC (permalink / raw)
To: linux-wireless; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@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.berg@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_SKB 0x20
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] backports: update genl-const patch for nl80211
2015-01-30 17:35 [PATCH] backports: update genl-const patch for nl80211 Johannes Berg
@ 2015-01-30 17:44 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2015-01-30 17:44 UTC (permalink / raw)
To: linux-wireless
On Fri, 2015-01-30 at 18:35 +0100, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@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.
Wrong list, and Arend sent the same patch already anyway... stupid me.
Sorry for the noise.
johannes
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-30 17:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-30 17:35 [PATCH] backports: update genl-const patch for nl80211 Johannes Berg
2015-01-30 17:44 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).