Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e7c4e4d authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: 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 ea086359

net/mac80211/rx.c

+0 −3
Original line number Diff line number Diff line
@@ -2180,9 +2180,6 @@ ieee80211_rx_h_mgmt_check(struct ieee80211_rx_data *rx) 
	if (rx->sdata->vif.type == NL80211_IFTYPE_AP &&

	    ieee80211_is_beacon(mgmt->frame_control) &&

	    !(rx->flags & IEEE80211_RX_BEACON_REPORTED)) {

		struct ieee80211_rx_status *status;



		status = IEEE80211_SKB_RXCB(rx->skb);

		cfg80211_report_obss_beacon(rx->local->hw.wiphy,

					    rx->skb->data, rx->skb->len,

					    status->freq, GFP_ATOMIC);

net/mac80211/status.c

+3 −3
Original line number Diff line number Diff line
@@ -350,7 +350,6 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
	bool send_to_cooked;

	bool acked;

	struct ieee80211_bar *bar;

	u16 tid;

	int rtap_len;



	for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
@@ -412,7 +411,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 
		}



		if (!acked && ieee80211_is_back_req(fc)) {

			u16 control;

			u16 tid, control;



			/*

			 * BAR failed, store the last SSN and retry sending
@@ -516,7 +515,8 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) 


		if (ieee80211_is_nullfunc(hdr->frame_control) ||

		    ieee80211_is_qos_nullfunc(hdr->frame_control)) {

			bool acked = info->flags & IEEE80211_TX_STAT_ACK;

			acked = info->flags & IEEE80211_TX_STAT_ACK;



			cfg80211_probe_status(skb->dev, hdr->addr1,

					      cookie, acked, GFP_ATOMIC);

		} else {