Re: [PATCH] backport: genl: add __genl_const for new hwsim mcast group

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

 



On 11/06/2014 12:02 PM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
> 
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
> ---
>  .../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
>   }
>   
> 

--
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