| Message ID | 20190831220108.10602-1-kw@linux.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | iwlwifi: mvm: Move static keyword to the front of declarations | expand |
On Sun, 2019-09-01 at 00:01 +0200, Krzysztof Wilczynski wrote: > Move the static keyword to the front of declarations of > he_if_types_ext_capa_sta and he_iftypes_ext_capa, and > resolve the following compiler warnings that can be seen > when building with warnings enabled (W=1): > > drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:427:1: warning: > ‘static’ is not at beginning of declaration [-Wold-style-declaration] > > drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:434:1: warning: > ‘static’ is not at beginning of declaration [-Wold-style-declaration] > > Signed-off-by: Krzysztof Wilczynski <kw@linux.com> > --- > Related: https://lore.kernel.org/r/20190827233017.GK9987@google.com > > drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c > index d6499763f0dd..937a843fed56 100644 > --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c > +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c > @@ -424,14 +424,14 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm) > return ret; > } > > -const static u8 he_if_types_ext_capa_sta[] = { > +static const u8 he_if_types_ext_capa_sta[] = { > [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, > [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, > [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF, > [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT, > }; > > -const static struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = { > +static const struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = { > { > .iftype = NL80211_IFTYPE_STATION, > .extended_capabilities = he_if_types_ext_capa_sta, Thanks for your patch! Though we already have this change in our internal tree (submitted by YueHaibing) and it will reach the mainline soon. -- Cheers, Luca.
Hi Luca, [...] > Thanks for your patch! Though we already have this change in our > internal tree (submitted by YueHaibing) and it will reach the mainline > soon. Thank you for letting me know. I am glad it's fixed. :) Krzysztof
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index d6499763f0dd..937a843fed56 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -424,14 +424,14 @@ int iwl_mvm_init_fw_regd(struct iwl_mvm *mvm) return ret; } -const static u8 he_if_types_ext_capa_sta[] = { +static const u8 he_if_types_ext_capa_sta[] = { [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF, [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT, }; -const static struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = { +static const struct wiphy_iftype_ext_capab he_iftypes_ext_capa[] = { { .iftype = NL80211_IFTYPE_STATION, .extended_capabilities = he_if_types_ext_capa_sta,
Move the static keyword to the front of declarations of he_if_types_ext_capa_sta and he_iftypes_ext_capa, and resolve the following compiler warnings that can be seen when building with warnings enabled (W=1): drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:427:1: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration] drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c:434:1: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration] Signed-off-by: Krzysztof Wilczynski <kw@linux.com> --- Related: https://lore.kernel.org/r/20190827233017.GK9987@google.com drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)