aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2016-01-13 14:21:01 +0100
committerJohannes Berg <johannes.berg@intel.com>2016-02-24 09:04:22 +0100
commitf06b7ab875037c3d99cd30a07c51caf34fbecb2c (patch)
tree4aa19f3729527bd59e7404605ee6a8606f5b27b5
parentmac80211: Make addr const in SET_IEEE80211_PERM_ADDR() (diff)
downloadlinux-dev-f06b7ab875037c3d99cd30a07c51caf34fbecb2c.tar.xz
linux-dev-f06b7ab875037c3d99cd30a07c51caf34fbecb2c.zip
mac80211_hwsim: remove shadowing variable
The function here already has a variable hdr that even contains the right thing, so the inner scope's hdr variable that's shadowing the outer one can just be removed. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--drivers/net/wireless/mac80211_hwsim.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index e31a94fd6135..ee37af1066d2 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -1333,10 +1333,8 @@ static void mac80211_hwsim_tx(struct ieee80211_hw *hw,
data->tx_bytes += skb->len;
ack = mac80211_hwsim_tx_frame_no_nl(hw, skb, channel);
- if (ack && skb->len >= 16) {
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
+ if (ack && skb->len >= 16)
mac80211_hwsim_monitor_ack(channel, hdr->addr2);
- }
ieee80211_tx_info_clear_status(txi);