* [PATCH V2] patches: genl-const: fix nl80211.patch
@ 2015-01-15 20:15 Arend van Spriel
2015-01-16 11:08 ` Johannes Berg
0 siblings, 1 reply; 3+ messages in thread
From: Arend van Spriel @ 2015-01-15 20:15 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports, Arend van Spriel
nl80211.c recently changed using defined strings instead of hard-coded in
multi-cast group definitions:
commit 71b836eca7f380fbd4c025f8c4371f9a071bc909
Author: Johannes Berg <johannes.berg@intel.com>
Date: Tue Dec 23 17:17:38 2014 +0100
nl80211: define multicast group names in header
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
V2:
- remove whitespace changes.
---
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 d8d67bb..21c2a86 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
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH V2] patches: genl-const: fix nl80211.patch
2015-01-15 20:15 [PATCH V2] patches: genl-const: fix nl80211.patch Arend van Spriel
@ 2015-01-16 11:08 ` Johannes Berg
2015-02-22 2:05 ` Hauke Mehrtens
0 siblings, 1 reply; 3+ messages in thread
From: Johannes Berg @ 2015-01-16 11:08 UTC (permalink / raw)
To: Arend van Spriel; +Cc: Luis R. Rodriguez, backports
On Thu, 2015-01-15 at 21:15 +0100, Arend van Spriel wrote:
> nl80211.c recently changed using defined strings instead of hard-coded in
> multi-cast group definitions:
>
> commit 71b836eca7f380fbd4c025f8c4371f9a071bc909
> Author: Johannes Berg <johannes.berg@intel.com>
> Date: Tue Dec 23 17:17:38 2014 +0100
>
> nl80211: define multicast group names in header
>
> Signed-off-by: Arend van Spriel <arend@broadcom.com>
Thanks Arend!
Acked-by: Johannes Berg <johannes@sipsolutions.net>
johannes
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH V2] patches: genl-const: fix nl80211.patch
2015-01-16 11:08 ` Johannes Berg
@ 2015-02-22 2:05 ` Hauke Mehrtens
0 siblings, 0 replies; 3+ messages in thread
From: Hauke Mehrtens @ 2015-02-22 2:05 UTC (permalink / raw)
To: Johannes Berg, Arend van Spriel; +Cc: Luis R. Rodriguez, backports
On 01/16/2015 12:08 PM, Johannes Berg wrote:
> On Thu, 2015-01-15 at 21:15 +0100, Arend van Spriel wrote:
>> nl80211.c recently changed using defined strings instead of hard-coded in
>> multi-cast group definitions:
>>
>> commit 71b836eca7f380fbd4c025f8c4371f9a071bc909
>> Author: Johannes Berg <johannes.berg@intel.com>
>> Date: Tue Dec 23 17:17:38 2014 +0100
>>
>> nl80211: define multicast group names in header
>>
>> Signed-off-by: Arend van Spriel <arend@broadcom.com>
>
> Thanks Arend!
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
>
> johannes
Thank you for the patch, it was applied to backports.
Hauke
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-22 2:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-01-15 20:15 [PATCH V2] patches: genl-const: fix nl80211.patch Arend van Spriel
2015-01-16 11:08 ` Johannes Berg
2015-02-22 2:05 ` Hauke Mehrtens
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.