[PATCH V2] patches: genl-const: fix nl80211.patch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

  commit 71b836eca7f380fbd4c025f8c4371f9a071bc909
  Author: Johannes Berg <johannes.berg@xxxxxxxxx>
  Date:   Tue Dec 23 17:17:38 2014 +0100

      nl80211: define multicast group names in header

Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
---
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

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux