Commit 292b4df6 authored by John W. Linville's avatar John W. Linville
Browse files

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: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a3275e24

net/mac80211/rx.c

+4 −4
Original line number Diff line number Diff line
@@ -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));