diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-06-24 11:13:56 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-06-24 11:13:56 -0400 |
| commit | 292b4df62a5a05a077269535d24eaabc8831c79d (patch) | |
| tree | ce1a110413099b13806d3db737f7f0423c3d9eec /net/mac80211 | |
| parent | a3275e24aa97fe303c66e4ab06a67b12730a8c2f (diff) | |
| download | linux-stable-292b4df62a5a05a077269535d24eaabc8831c79d.tar.gz linux-stable-292b4df62a5a05a077269535d24eaabc8831c79d.tar.bz2 linux-stable-292b4df62a5a05a077269535d24eaabc8831c79d.zip | |
mac80211: don't shadow mgmt variable in ieee80211_rx_h_action
net/mac80211/rx.c:2059:39: warning: symbol 'mgmt' shadows an earlier one
net/mac80211/rx.c:1916:31: originally declared here
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 1f76352caa9e..ab58a5d66d2e 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2056,11 +2056,11 @@ ieee80211_rx_h_action(struct ieee80211_rx_data *rx) nskb = skb_copy_expand(rx->skb, local->hw.extra_tx_headroom, 0, GFP_ATOMIC); if (nskb) { - struct ieee80211_mgmt *mgmt = (void *)nskb->data; + struct ieee80211_mgmt *nmgmt = (void *)nskb->data; - mgmt->u.action.category |= 0x80; - memcpy(mgmt->da, mgmt->sa, ETH_ALEN); - memcpy(mgmt->sa, rx->sdata->vif.addr, ETH_ALEN); + nmgmt->u.action.category |= 0x80; + memcpy(nmgmt->da, nmgmt->sa, ETH_ALEN); + memcpy(nmgmt->sa, rx->sdata->vif.addr, ETH_ALEN); memset(nskb->cb, 0, sizeof(nskb->cb)); |