staging: rtl8723au: add GFP argument to rtw_alloc_network()

This allows us to use GFP_KERNEL when calling from a work handler.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c
index dc61a816e39b15bc1a763f9db328db4055634115..b94049fa96d8573dd5c24c24eeac5e100b88efe6 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -1523,7 +1523,7 @@ void rtw_createbss_cmd23a_callback(struct rtw_adapter *padapter,
                rtw_indicate_connect23a(padapter);
                spin_unlock_bh(&pmlmepriv->lock);
        } else {
-               pwlan = rtw_alloc_network(pmlmepriv);
+               pwlan = rtw_alloc_network(pmlmepriv, GFP_KERNEL);
                spin_lock_bh(&pmlmepriv->scanned_queue.lock);
                if (!pwlan) {
                        pwlan = rtw_get_oldest_wlan_network23a(&pmlmepriv->scanned_queue);

diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c
index ddbe6c6482251eda8b31d0415245bffdce68ec2d..8983862d44f20d79a0c5aab495abea2888efb9d0 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723au/core/rtw_mlme.c
@@ -127,11 +127,11 @@ void rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv)
        rtw23a_free_mlme_priv_ie_data(pmlmepriv);
 }
 
-struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)
+struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv, int gfp)
 {
        struct wlan_network *pnetwork;
 
-       pnetwork = kzalloc(sizeof(struct wlan_network), GFP_ATOMIC);
+       pnetwork = kzalloc(sizeof(struct wlan_network), gfp);
        if (pnetwork) {
                INIT_LIST_HEAD(&pnetwork->list);
                pnetwork->network_type = 0;
@@ -514,7 +514,7 @@ void rtw_update_scanned_network23a(struct rtw_adapter *adapter,
        /* If we didn't find a match, then get a new network slot to initialize
         * with this beacon's information */
        if (!found) {
-               pnetwork = rtw_alloc_network(pmlmepriv);
+               pnetwork = rtw_alloc_network(pmlmepriv, GFP_ATOMIC);
                if (!pnetwork) {
                        if (!oldest) {
                                RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_,

diff --git a/drivers/staging/rtl8723au/include/rtw_mlme.h b/drivers/staging/rtl8723au/include/rtw_mlme.h
index 6dd8fb4765532ab3285a8895d2cd2cc983d69866..2b72d5bd4d287b7a6a080226b5380cb96b02f556 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723au/include/rtw_mlme.h
@@ -454,7 +454,7 @@ void rtw23a_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
 
 void _rtw_free_mlme_priv23a(struct mlme_priv *pmlmepriv);
 
-struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv);
+struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv, int gfp);
 
 int rtw_if_up23a(struct rtw_adapter *padapter);