* [PATCH] backport: genl: add __genl_const for new hwsim mcast group
@ 2014-11-06 11:02 Johannes Berg
2014-11-15 19:56 ` Hauke Mehrtens
0 siblings, 1 reply; 4+ messages in thread
From: Johannes Berg @ 2014-11-06 11:02 UTC (permalink / raw)
To: backports; +Cc: Johannes Berg
From: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
.../collateral-evolutions/network/0027-genl-const/hwsim.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
index 33cba175dda6..d6cb0350f1d1 100644
--- a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
+++ b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
@@ -1,5 +1,16 @@
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -491,7 +491,7 @@ enum hwsim_multicast_groups {
+ HWSIM_MCGRP_CONFIG,
+ };
+
+-static const struct genl_multicast_group hwsim_mcgrps[] = {
++static __genl_const struct genl_multicast_group hwsim_mcgrps[] = {
+ [HWSIM_MCGRP_CONFIG] = { .name = "config", },
+ };
+
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -2483,7 +2483,7 @@ static int hwsim_destroy_radio_nl(struct
}
--
2.1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] backport: genl: add __genl_const for new hwsim mcast group
2014-11-06 11:02 [PATCH] backport: genl: add __genl_const for new hwsim mcast group Johannes Berg
@ 2014-11-15 19:56 ` Hauke Mehrtens
2014-11-16 16:47 ` Hauke Mehrtens
2014-11-16 20:08 ` Johannes Berg
0 siblings, 2 replies; 4+ messages in thread
From: Hauke Mehrtens @ 2014-11-15 19:56 UTC (permalink / raw)
To: Johannes Berg, backports; +Cc: Johannes Berg
On 11/06/2014 12:02 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> .../collateral-evolutions/network/0027-genl-const/hwsim.patch | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
> index 33cba175dda6..d6cb0350f1d1 100644
> --- a/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
> +++ b/patches/collateral-evolutions/network/0027-genl-const/hwsim.patch
> @@ -1,5 +1,16 @@
> --- a/drivers/net/wireless/mac80211_hwsim.c
> +++ b/drivers/net/wireless/mac80211_hwsim.c
> +@@ -491,7 +491,7 @@ enum hwsim_multicast_groups {
> + HWSIM_MCGRP_CONFIG,
> + };
> +
> +-static const struct genl_multicast_group hwsim_mcgrps[] = {
> ++static __genl_const struct genl_multicast_group hwsim_mcgrps[] = {
> + [HWSIM_MCGRP_CONFIG] = { .name = "config", },
> + };
> +
> +--- a/drivers/net/wireless/mac80211_hwsim.c
> ++++ b/drivers/net/wireless/mac80211_hwsim.c
The last two lines are wrong, now we have to of these in the patch.
> @@ -2483,7 +2483,7 @@ static int hwsim_destroy_radio_nl(struct
> }
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] backport: genl: add __genl_const for new hwsim mcast group
2014-11-15 19:56 ` Hauke Mehrtens
@ 2014-11-16 16:47 ` Hauke Mehrtens
2014-11-16 20:08 ` Johannes Berg
1 sibling, 0 replies; 4+ messages in thread
From: Hauke Mehrtens @ 2014-11-16 16:47 UTC (permalink / raw)
To: Johannes Berg, backports; +Cc: Johannes Berg
On 11/15/2014 08:56 PM, Hauke Mehrtens wrote:
> On 11/06/2014 12:02 PM, Johannes Berg wrote:
>> From: Johannes Berg <johannes.berg@intel.com>
>>
>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> ---
>> .../collateral-evolutions/network/0027-genl-const/hwsim.patch | 11 +++++++++++
>> 1 file changed, 11 insertions(+)
>>
Thank you for your patch, it was pushed, with the modification I
explained in the last mail.
Hauke
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] backport: genl: add __genl_const for new hwsim mcast group
2014-11-15 19:56 ` Hauke Mehrtens
2014-11-16 16:47 ` Hauke Mehrtens
@ 2014-11-16 20:08 ` Johannes Berg
1 sibling, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2014-11-16 20:08 UTC (permalink / raw)
To: Hauke Mehrtens; +Cc: backports
On Sat, 2014-11-15 at 20:56 +0100, Hauke Mehrtens wrote:
> > +--- a/drivers/net/wireless/mac80211_hwsim.c
> > ++++ b/drivers/net/wireless/mac80211_hwsim.c
>
> The last two lines are wrong, now we have to of these in the patch.
Sorry, I guess patch was happy with it nonetheless, probably patching
the file twice...
Thanks for fixing it up.
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-11-16 20:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-06 11:02 [PATCH] backport: genl: add __genl_const for new hwsim mcast group Johannes Berg
2014-11-15 19:56 ` Hauke Mehrtens
2014-11-16 16:47 ` Hauke Mehrtens
2014-11-16 20:08 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox