Skip to content

Commit

Permalink
mac80211: don't shadow mgmt variable in ieee80211_rx_h_action
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
John W. Linville committed Jun 24, 2010
1 parent a3275e2 commit 292b4df
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions net/mac80211/rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down

0 comments on commit 292b4df

Please sign in to comment.