Skip to contentSkip to conversation

patches: genl-const: fix nl80211.patch

PATCH In review Arend van Spriel 3 participants 3 messages Jan 15, 2015 – Feb 22, 2015

lore
Share & tools
lore

Arend van Spriel

author
#0 lore raw

PATCH v2 1/1 patches: genl-const: fix nl80211.patch

nl80211.c recently changed using defined strings instead of hard-coded in multi-cast group definitions:

commit 71b836eca7f380fbd4c025f8c4371f9a071bc909
Author: Johannes Berg <[email protected]>
Date: Tue Dec 23 17:17:38 2014 +0100

nl80211: define multicast group names in header

Signed-off-by Arend van Spriel <[email protected]>

---
V2:
- remove whitespace changes.

---
 patches/collateral-evolutions/network/0027-genl-const/nl80211.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +3 -3
index d8d67bb..21c2a86 100644
@@ -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
Signature · 1 line
1.9.1
#2 lore raw
Quoted 10 lines · Johannes Berg
Quoted 9 lines · Arend van Spriel

nl80211.c recently changed using defined strings instead of hard-coded in multi-cast group definitions:

commit 71b836eca7f380fbd4c025f8c4371f9a071bc909
Author: Johannes Berg <[email protected]>
Date: Tue Dec 23 17:17:38 2014 +0100

nl80211: define multicast group names in header

Quoted 7 lines
Quoted 1 line
Signed-off-by Arend van Spriel <[email protected]>

Thanks Arend!

Acked-by Johannes Berg <[email protected]>

johannes

Thank you for the patch, it was applied to backports.

Hauke