Message ID | 20180308061224.GA5299@felix-thinkpad.cavium.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | [net-next] liquidio: Resolved mbox read issue while reading more than one 64bit data | expand |
From: Felix Manlunas <felix.manlunas@cavium.com> Date: Wed, 7 Mar 2018 22:12:24 -0800 > From: Intiyaz Basha <intiyaz.basha@cavium.com> > > Corrected length check when data received in the mbox is more than one > 64 bit data value > > Signed-off-by: Intiyaz Basha <intiyaz.basha@cavium.com> > Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com> Applied.
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c index 57af7df..28e74ee 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c @@ -87,7 +87,7 @@ int octeon_mbox_read(struct octeon_mbox *mbox) } if (mbox->state & OCTEON_MBOX_STATE_REQUEST_RECEIVING) { - if (mbox->mbox_req.recv_len < msg.s.len) { + if (mbox->mbox_req.recv_len < mbox->mbox_req.msg.s.len) { ret = 0; } else { mbox->state &= ~OCTEON_MBOX_STATE_REQUEST_RECEIVING; @@ -96,7 +96,8 @@ int octeon_mbox_read(struct octeon_mbox *mbox) } } else { if (mbox->state & OCTEON_MBOX_STATE_RESPONSE_RECEIVING) { - if (mbox->mbox_resp.recv_len < msg.s.len) { + if (mbox->mbox_resp.recv_len < + mbox->mbox_resp.msg.s.len) { ret = 0; } else { mbox->state &=