Skip to contentSkip to conversation

patches: genl-const: fix nl80211.patch

PATCH Superseded Arend van Spriel 1 participant 2 messages Jan 15, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Arend van Spriel

author
#0 lore raw

PATCH 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]>
---
 .../network/0027-genl-const/nl80211.patch              | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +9 -9
index d8d67bb..51dead3 100644
@@ -3,28 +3,28 @@
 @@ -31,9 +31,9 @@ static int nl80211_crypto_settings(struc
  				   struct cfg80211_crypto_settings *settings,
  				   int cipher_limit);
- 
+
 -static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
 +static int nl80211_pre_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
  			    struct genl_info *info);
 -static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
 +static void nl80211_post_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
  			      struct genl_info *info);
- 
+
  /* the netlink family */
 @@ -58,7 +58,7 @@ enum nl80211_multicast_groups {
  	NL80211_MCGRP_TESTMODE /* keep last - ifdef! */
  };
- 
+
 -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
- 
+
 -static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
 +static int nl80211_pre_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
  			    struct genl_info *info)

@@ -33,7 +33,7 @@
 @@ -10007,7 +10007,7 @@ static int nl80211_pre_doit(const struct
  	return 0;
  }
- 
+
 -static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
 +static void nl80211_post_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
  			      struct genl_info *info)

@@ -42,7 +42,7 @@
 @@ -10036,7 +10036,7 @@ static void nl80211_post_doit(const stru
  	}
  }
- 
+
 -static const struct genl_ops nl80211_ops[] = {
 +static __genl_const struct genl_ops nl80211_ops[] = {
  	{
Signature · 1 line
1.9.1
author
#1 lore raw
Quoted 19 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

Signed-off-by Arend van Spriel<[email protected]>
---
  .../network/0027-genl-const/nl80211.patch              | 18 +++++++++---------
  1 file changed, 9 insertions(+), 9 deletions(-)
patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +0 -0
index d8d67bb..51dead3 100644

patches/collateral-evolutions/network/0027-genl-const/nl80211.patch line 6

Quoted 5 lines
patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +1 -1
@@ -3,28 +3,28 @@
  @@ -31,9 +31,9 @@ static int nl80211_crypto_settings(struc
   				   struct cfg80211_crypto_settings *settings,
   				   int cipher_limit);
-
+

Seems like my editor got a bit carried away fixing white-space stuff.

Regards,
Arend

Quoted 48 lines
patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +8 -8
  -static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
  +static int nl80211_pre_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
   			    struct genl_info *info);
  -static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
  +static void nl80211_post_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
   			      struct genl_info *info);
-
+
   /* the netlink family */
  @@ -58,7 +58,7 @@ enum nl80211_multicast_groups {
   	NL80211_MCGRP_TESTMODE /* keep last - ifdef! */
   };
-
+
  -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
-
+
  -static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
  +static int nl80211_pre_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
   			    struct genl_info *info)

@@ -33,7 +33,7 @@
  @@ -10007,7 +10007,7 @@ static int nl80211_pre_doit(const struct
   	return 0;
   }
-
+
  -static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
  +static void nl80211_post_doit(__genl_const struct genl_ops *ops, struct sk_buff *skb,
   			      struct genl_info *info)

@@ -42,7 +42,7 @@
  @@ -10036,7 +10036,7 @@ static void nl80211_post_doit(const stru
   	}
   }
-
+
  -static const struct genl_ops nl80211_ops[] = {
  +static __genl_const struct genl_ops nl80211_ops[] = {
   	{