[PATCH AUTOSEL for 4.9 024/190] mwifiex: Fix invalid port issue

[Sasha Levin]

From: Ganapathi Bhat 

[ Upstream commit ecd7eb7c2bcf99f6c23d68ad56ce15949da848a1 ]

We have to use start port, for TX/RX of single packet,
instead of current aggregating port. This will fix SDIO
CMD53(TX/RX) returning -ETIMEDOUT and halting the data path.

Fixes: 0cb52aac4d19 ("mwifiex: do not set multiport flag for tx/rx single 
packet")
Signed-off-by: Ganapathi Bhat 
Signed-off-by: Kalle Valo 
Signed-off-by: Sasha Levin 
---
 drivers/net/wireless/marvell/mwifiex/sdio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c 
b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 8d601dcf2948..486b8c75cd1f 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -1458,7 +1458,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct 
mwifiex_adapter *adapter,
}
 
if (card->mpa_rx.pkt_cnt == 1)
-   mport = adapter->ioport + port;
+   mport = adapter->ioport + card->mpa_rx.start_port;
 
if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf,
   card->mpa_rx.buf_len, mport, 1))
@@ -1891,7 +1891,7 @@ static int mwifiex_host_to_card_mp_aggr(struct 
mwifiex_adapter *adapter,
}
 
if (card->mpa_tx.pkt_cnt == 1)
-   mport = adapter->ioport + port;
+   mport = adapter->ioport + card->mpa_tx.start_port;
 
ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf,
 card->mpa_tx.buf_len, mport);
-- 
2.14.1

[PATCH AUTOSEL for 4.9 024/190] mwifiex: Fix invalid port issue

[Sasha Levin]

From: Ganapathi Bhat 

[ Upstream commit ecd7eb7c2bcf99f6c23d68ad56ce15949da848a1 ]

We have to use start port, for TX/RX of single packet,
instead of current aggregating port. This will fix SDIO
CMD53(TX/RX) returning -ETIMEDOUT and halting the data path.

Fixes: 0cb52aac4d19 ("mwifiex: do not set multiport flag for tx/rx single 
packet")
Signed-off-by: Ganapathi Bhat 
Signed-off-by: Kalle Valo 
Signed-off-by: Sasha Levin 
---
 drivers/net/wireless/marvell/mwifiex/sdio.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c 
b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 8d601dcf2948..486b8c75cd1f 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -1458,7 +1458,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct 
mwifiex_adapter *adapter,
}
 
if (card->mpa_rx.pkt_cnt == 1)
-   mport = adapter->ioport + port;
+   mport = adapter->ioport + card->mpa_rx.start_port;
 
if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf,
   card->mpa_rx.buf_len, mport, 1))
@@ -1891,7 +1891,7 @@ static int mwifiex_host_to_card_mp_aggr(struct 
mwifiex_adapter *adapter,
}
 
if (card->mpa_tx.pkt_cnt == 1)
-   mport = adapter->ioport + port;
+   mport = adapter->ioport + card->mpa_tx.start_port;
 
ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf,
 card->mpa_tx.buf_len, mport);
-- 
2.14.1