diff options
author | Arend van Spriel <arend@broadcom.com> | 2015-01-15 21:15:42 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-02-22 01:59:45 +0100 |
commit | ccbd503ca0e6c23d8627058683be2d8635c68bfc (patch) | |
tree | 203ef3269fef14a60bd082ec12a4d6f1b0f04141 /patches | |
parent | 16e3af4e2f62eb27b06a42720f537f0495ae8a43 (diff) |
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 <johannes.berg@intel.com>
Date: Tue Dec 23 17:17:38 2014 +0100
nl80211: define multicast group names in header
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collateral-evolutions/network/0027-genl-const/nl80211.patch | 6 |
1 files 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 d8d67bb9..21c2a86e 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 |