summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/mwifiex/sta_rx.c
diff options
context:
space:
mode:
authorYogesh Ashok Powar <yogeshp@marvell.com>2012-01-11 20:06:11 -0800
committerJohn W. Linville <linville@tuxdriver.com>2012-01-24 14:21:12 -0500
commit9da9a3b29ba6a9a98e437f24576f13cbe259997b (patch)
treeaa59108d6e5ef4ad27f82f6c5a3f3c77893ae43e /drivers/net/wireless/mwifiex/sta_rx.c
parentcebcab9e18725d8249f607af787ee92107a665b7 (diff)
downloadlinux-3.10-9da9a3b29ba6a9a98e437f24576f13cbe259997b.tar.gz
linux-3.10-9da9a3b29ba6a9a98e437f24576f13cbe259997b.tar.bz2
linux-3.10-9da9a3b29ba6a9a98e437f24576f13cbe259997b.zip
mwifiex: use bss_type and bss_num to retrieve priv
Current implementation, for retrieving priv from adapter, uses bss_index. In multi interface environment supporting different types, bss_index may not be unique. Use bss_type along with bss_num to retrieve the priv. bss_index is removed with this change. 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/sta_rx.c')
-rw-r--r--drivers/net/wireless/mwifiex/sta_rx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c
index 5e1ef7e5da4..d7a5d7616f2 100644
--- a/drivers/net/wireless/mwifiex/sta_rx.c
+++ b/drivers/net/wireless/mwifiex/sta_rx.c
@@ -43,7 +43,8 @@ int mwifiex_process_rx_packet(struct mwifiex_adapter *adapter,
{
int ret;
struct mwifiex_rxinfo *rx_info = MWIFIEX_SKB_RXCB(skb);
- struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+ struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter,
+ rx_info->bss_num, rx_info->bss_type);
struct rx_packet_hdr *rx_pkt_hdr;
struct rxpd *local_rx_pd;
int hdr_chop;
@@ -124,7 +125,8 @@ int mwifiex_process_sta_rx_packet(struct mwifiex_adapter *adapter,
struct rx_packet_hdr *rx_pkt_hdr;
u8 ta[ETH_ALEN];
u16 rx_pkt_type;
- struct mwifiex_private *priv = adapter->priv[rx_info->bss_index];
+ struct mwifiex_private *priv = mwifiex_get_priv_by_id(adapter,
+ rx_info->bss_num, rx_info->bss_type);
if (!priv)
return -1;