[Qemu-devel] [PATCH] net/vmxnet3: Fix incorrect debug message

[Qemu-devel] [PATCH] net/vmxnet3: Fix incorrect debug message

[Shmulik Ladkani]

From: Dana Rubin <dana.rubin@ravellosystems.com>

From: Dana Rubin <dana.rubin@ravellosystems.com>

In commit 80da311d81,
   "net/vmxnet3: Fix RX TCP/UDP checksum on partially summed packets"
a debug message was introduced in vmxnet3_rx_need_csum_calculate() for
an unlikely input condition.

The message accidentally printed 'len' variable instead of 'pkt_len'.
Fix, providing the correct argument.

Signed-off-by: Dana Rubin <dana.rubin@ravellosystems.com>
Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
---
 hw/net/vmxnet3.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 59b06b8..071feeb 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -927,9 +927,9 @@ static void vmxnet3_rx_need_csum_calculate(struct VmxnetRxPkt *pkt,
 
     /* Validate packet len: csum_start + scum_offset + length of csum field */
     if (pkt_len < (vhdr->csum_start + vhdr->csum_offset + 2)) {
-        VMW_PKPRN("packet len:%d < csum_start(%d) + csum_offset(%d) + 2, "
+        VMW_PKPRN("packet len:%lu < csum_start(%d) + csum_offset(%d) + 2, "
                   "cannot calculate checksum",
-                  len, vhdr->csum_start, vhdr->csum_offset);
+                  pkt_len, vhdr->csum_start, vhdr->csum_offset);
         return;
     }
 
-- 
1.9.1

Re: [Qemu-devel] [PATCH] net/vmxnet3: Fix incorrect debug message

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 868 bytes --]

On Tue, Jul 28, 2015 at 09:44:50PM +0300, Shmulik Ladkani wrote:
> From: Dana Rubin <dana.rubin@ravellosystems.com>
> 
> From: Dana Rubin <dana.rubin@ravellosystems.com>
> 
> In commit 80da311d81,
>    "net/vmxnet3: Fix RX TCP/UDP checksum on partially summed packets"
> a debug message was introduced in vmxnet3_rx_need_csum_calculate() for
> an unlikely input condition.
> 
> The message accidentally printed 'len' variable instead of 'pkt_len'.
> Fix, providing the correct argument.
> 
> Signed-off-by: Dana Rubin <dana.rubin@ravellosystems.com>
> Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
> ---
>  hw/net/vmxnet3.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Not critical, so applying for QEMU 2.5.

Thanks, applied to my net-next tree:
https://github.com/stefanha/qemu/commits/net-next

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]