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>
This commit is contained in:
John W. Linville 2010-06-24 11:13:56 -04:00
Родитель a3275e24aa
Коммит 292b4df62a
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -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, nskb = skb_copy_expand(rx->skb, local->hw.extra_tx_headroom, 0,
GFP_ATOMIC); GFP_ATOMIC);
if (nskb) { if (nskb) {
struct ieee80211_mgmt *mgmt = (void *)nskb->data; struct ieee80211_mgmt *nmgmt = (void *)nskb->data;
mgmt->u.action.category |= 0x80; nmgmt->u.action.category |= 0x80;
memcpy(mgmt->da, mgmt->sa, ETH_ALEN); memcpy(nmgmt->da, nmgmt->sa, ETH_ALEN);
memcpy(mgmt->sa, rx->sdata->vif.addr, ETH_ALEN); memcpy(nmgmt->sa, rx->sdata->vif.addr, ETH_ALEN);
memset(nskb->cb, 0, sizeof(nskb->cb)); memset(nskb->cb, 0, sizeof(nskb->cb));