Commit 2da8f419 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

cfg80211: fix a few -Wshadow warnings 



It seems that -Wshadow is no longer default in
sparse runs, but let's fix the warnings anyway.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8e7c4e4d

net/wireless/nl80211.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -427,8 +427,7 @@ static int nl80211_parse_key_new(struct nlattr *key, struct key_parse *k) 




	if (tb[NL80211_KEY_DEFAULT_TYPES]) {

	if (tb[NL80211_KEY_DEFAULT_TYPES]) {

		struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES];

		struct nlattr *kdt[NUM_NL80211_KEY_DEFAULT_TYPES];

		int err = nla_parse_nested(kdt,

		err = nla_parse_nested(kdt, NUM_NL80211_KEY_DEFAULT_TYPES - 1,

					   NUM_NL80211_KEY_DEFAULT_TYPES - 1,

				       tb[NL80211_KEY_DEFAULT_TYPES],

				       tb[NL80211_KEY_DEFAULT_TYPES],

				       nl80211_key_default_policy);

				       nl80211_key_default_policy);

		if (err)

		if (err)
@@ -4781,7 +4780,6 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) 
			nla_len(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);

			nla_len(info->attrs[NL80211_ATTR_BSS_BASIC_RATES]);

		struct ieee80211_supported_band *sband =

		struct ieee80211_supported_band *sband =

			wiphy->bands[ibss.channel->band];

			wiphy->bands[ibss.channel->band];

		int err;





		err = ieee80211_get_ratemask(sband, rates, n_rates,

		err = ieee80211_get_ratemask(sband, rates, n_rates,

					     &ibss.basic_rates);

					     &ibss.basic_rates);