Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970fdfa8 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Johannes Berg
Browse files

cfg80211: remove @gfp parameter from cfg80211_rx_mgmt() 



In the cfg80211_rx_mgmt(), parameter @gfp was used for the memory allocation.
But, memory get allocated under spin_lock_bh(), this implies atomic context.
So, one can't use GFP_KERNEL, only variants with no __GFP_WAIT. Actually, in all
occurrences GFP_ATOMIC is used (wil6210 use GFP_KERNEL by mistake),
and it should be this way or warning triggered in the memory allocation code.

Remove @gfp parameter as no actual choice exist, and use hard coded
GFP_ATOMIC for memory allocation.

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 649b2a4d

drivers/net/wireless/ath/ath6kl/wmi.c

+2 −3
Original line number Diff line number Diff line
@@ -619,8 +619,7 @@ static int ath6kl_wmi_rx_probe_req_event_rx(struct wmi *wmi, u8 *datap, int len, 
		   dlen, freq, vif->probe_req_report);



	if (vif->probe_req_report || vif->nw_type == AP_NETWORK)

		cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0,

				 GFP_ATOMIC);

		cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0);



	return 0;

}
@@ -659,7 +658,7 @@ static int ath6kl_wmi_rx_action_event_rx(struct wmi *wmi, u8 *datap, int len, 
		return -EINVAL;

	}

	ath6kl_dbg(ATH6KL_DBG_WMI, "rx_action: len=%u freq=%u\n", dlen, freq);

	cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0, GFP_ATOMIC);

	cfg80211_rx_mgmt(&vif->wdev, freq, 0, ev->data, dlen, 0);



	return 0;

}

drivers/net/wireless/ath/wil6210/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len) 
		}

	} else {

		cfg80211_rx_mgmt(wil->wdev, freq, signal,

				 (void *)rx_mgmt_frame, d_len, 0, GFP_KERNEL);

				 (void *)rx_mgmt_frame, d_len, 0);

	}

}

drivers/net/wireless/brcm80211/brcmfmac/p2p.c

+2 −4
Original line number Diff line number Diff line
@@ -1431,8 +1431,7 @@ int brcmf_p2p_notify_action_frame_rx(struct brcmf_if *ifp, 
					      IEEE80211_BAND_5GHZ);



	wdev = &ifp->vif->wdev;

	cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, 0,

			 GFP_ATOMIC);

	cfg80211_rx_mgmt(wdev, freq, 0, (u8 *)mgmt_frame, mgmt_frame_len, 0);



	kfree(mgmt_frame);

	return 0;
@@ -1896,8 +1895,7 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probereq(struct brcmf_if *ifp, 
					      IEEE80211_BAND_2GHZ :

					      IEEE80211_BAND_5GHZ);



	cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len, 0,

			 GFP_ATOMIC);

	cfg80211_rx_mgmt(&vif->wdev, freq, 0, mgmt_frame, mgmt_frame_len, 0);



	brcmf_dbg(INFO, "mgmt_frame_len (%d) , e->datalen (%d), chanspec (%04x), freq (%d)\n",

		  mgmt_frame_len, e->datalen, chanspec, freq);

drivers/net/wireless/mwifiex/util.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ mwifiex_process_mgmt_packet(struct mwifiex_private *priv, 


	cfg80211_rx_mgmt(priv->wdev, priv->roc_cfg.chan.center_freq,

			 CAL_RSSI(rx_pd->snr, rx_pd->nf), skb->data, pkt_len,

			 0, GFP_ATOMIC);

			 0);



	return 0;

}

drivers/staging/rtl8723au/core/rtw_mlme_ext.c

+1 −1
Original line number Diff line number Diff line
@@ -2128,7 +2128,7 @@ static int on_action_public23a(struct rtw_adapter *padapter, 
						      IEEE80211_BAND_5GHZ);



	if (cfg80211_rx_mgmt(padapter->rtw_wdev, freq, 0, pframe,

			     skb->len, 0, GFP_ATOMIC))

			     skb->len, 0))

		return _SUCCESS;



	return _FAIL;