summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/wmm.c
diff options
context:
space:
mode:
authorAvinash Patil2012-05-09 03:30:13 +0200
committerJohn W. Linville2012-05-16 18:46:34 +0200
commit64b05e2f46598a504c1af05844e98d03df552ce5 (patch)
tree7631e6ba03ac66b439e876eaed3883c2bf69a69f /drivers/net/wireless/mwifiex/wmm.c
parentb43: use pci_is_pcie() instead of obsolete pci_dev.is_pcie (diff)
downloadkernel-qcow2-linux-64b05e2f46598a504c1af05844e98d03df552ce5.tar.gz
kernel-qcow2-linux-64b05e2f46598a504c1af05844e98d03df552ce5.tar.xz
kernel-qcow2-linux-64b05e2f46598a504c1af05844e98d03df552ce5.zip
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: Avinash Patil <patila@marvell.com> Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: Kiran Divekar <dkiran@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/mwifiex/wmm.c')
-rw-r--r--drivers/net/wireless/mwifiex/wmm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/mwifiex/wmm.c b/drivers/net/wireless/mwifiex/wmm.c
index 429a1dee2d26..f3fc65515857 100644
--- a/drivers/net/wireless/mwifiex/wmm.c
+++ b/drivers/net/wireless/mwifiex/wmm.c
@@ -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 =