From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 1/2] mac80211: fix a few -Wshadow warnings
Date: Fri, 20 Jan 2012 13:52:36 +0100 [thread overview]
Message-ID: <20120120125312.956655635@sipsolutions.net> (raw)
In-Reply-To: 20120120125235.243434836@sipsolutions.net
From: Johannes Berg <johannes.berg@intel.com>
It seems that -Wshadow is no longer default in
sparse runs, but let's fix the warnings anyway.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
net/mac80211/rx.c | 3 ---
net/mac80211/status.c | 6 +++---
2 files changed, 3 insertions(+), 6 deletions(-)
--- a/net/mac80211/rx.c 2012-01-20 13:50:03.000000000 +0100
+++ b/net/mac80211/rx.c 2012-01-20 13:50:10.000000000 +0100
@@ -2180,9 +2180,6 @@ ieee80211_rx_h_mgmt_check(struct ieee802
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);
--- a/net/mac80211/status.c 2012-01-20 13:50:03.000000000 +0100
+++ b/net/mac80211/status.c 2012-01-20 13:50:10.000000000 +0100
@@ -350,7 +350,6 @@ void ieee80211_tx_status(struct ieee8021
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 ieee8021
}
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 ieee8021
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 {
next prev parent reply other threads:[~2012-01-20 12:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 12:52 [PATCH 0/2] fix shadow warnings Johannes Berg
2012-01-20 12:52 ` Johannes Berg [this message]
2012-01-20 12:52 ` [PATCH 2/2] cfg80211: fix a few -Wshadow warnings Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120120125312.956655635@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.