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

Commit 64b05e2f authored by Avinash Patil's avatar Avinash Patil Committed by John W. Linville
Browse files

mwifiex: allocate space for one more mwifiex_private structure 



Reserve space for one more priv structure.
This will be used by AP interface.

Signed-off-by: default avatarAvinash Patil <patila@marvell.com>
Signed-off-by: default avatarYogesh Ashok Powar <yogeshp@marvell.com>
Signed-off-by: default avatarKiran Divekar <dkiran@marvell.com>
Signed-off-by: default avatarBing Zhao <bzhao@marvell.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dfcfb545

drivers/net/wireless/mwifiex/decl.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/ieee80211.h>





#define MWIFIEX_MAX_BSS_NUM         (1)

#define MWIFIEX_MAX_BSS_NUM         (2)



#define MWIFIEX_MIN_DATA_HEADER_LEN 36	/* sizeof(mwifiex_txpd)

					 *   + 4 byte alignment

drivers/net/wireless/mwifiex/main.c

+18 −15
Original line number Diff line number Diff line
@@ -64,17 +64,17 @@ static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops, 


	adapter->priv_num = 0;



	for (i = 0; i < MWIFIEX_MAX_BSS_NUM; i++) {

		/* Allocate memory for private structure */

	adapter->priv[0] = kzalloc(sizeof(struct mwifiex_private), GFP_KERNEL);

	if (!adapter->priv[0]) {

		dev_err(adapter->dev,

			"%s: failed to alloc priv[0]\n", __func__);

		adapter->priv[i] =

			kzalloc(sizeof(struct mwifiex_private), GFP_KERNEL);

		if (!adapter->priv[i])

			goto error;

	}



		adapter->priv[i]->adapter = adapter;

		adapter->priv[i]->bss_priority = i;

		adapter->priv_num++;



	adapter->priv[0]->adapter = adapter;

	}

	mwifiex_init_lock_list(adapter);



	init_timer(&adapter->cmd_timer);
@@ -836,12 +836,15 @@ int mwifiex_remove_card(struct mwifiex_adapter *adapter, struct semaphore *sem) 
	}



	priv = adapter->priv[0];

	if (!priv)

	if (!priv || !priv->wdev)

		goto exit_remove;



	if (priv->wdev) {

	wiphy_unregister(priv->wdev->wiphy);

	wiphy_free(priv->wdev->wiphy);



	for (i = 0; i < adapter->priv_num; i++) {

		priv = adapter->priv[i];

		if (priv)

			kfree(priv->wdev);

	}

drivers/net/wireless/mwifiex/wmm.c

+4 −0
Original line number Diff line number Diff line
@@ -885,6 +885,10 @@ mwifiex_wmm_get_highest_priolist_ptr(struct mwifiex_adapter *adapter, 
				tid_ptr = &(priv_tmp)->wmm.

					tid_tbl_ptr[tos_to_tid[i]];



				/* For non-STA ra_list_curr may be NULL */

				if (!tid_ptr->ra_list_curr)

					continue;



				spin_lock_irqsave(&tid_ptr->tid_tbl_lock,

						  flags);

				is_list_empty =