From: David S. Miller <davem@davemloft.net>
Date: Mon, 5 Aug 2024 10:10:22 +0000 (+0100)
Subject: Merge branch 'virtio-net-rq-coalescing' into main
X-Git-Tag: v6.11-rc3~25^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=268762d0bbe778952ebda77a9ae8b8b3b584ae61;p=thirdparty%2Flinux.git

Merge branch 'virtio-net-rq-coalescing' into main

Heng Qi says:

====================
virtio-net: unbreak vq resizing if vq coalescing is not supported

Currently, if the driver does not negotiate the vq coalescing feature
but supports vq resize, the vq resize action, which could have been
successfully executed, is interrupted due to the failure in configuring
the vq coalescing parameters. This issue needs to be fixed.

Changelog
=========
v3->v4:
  - Add a comment for patch[2/2].

v2->v3:
  - Break out the feature check and the fix into separate patches.

v1->v2:
  - Rephrase the subject.
  - Put the feature check inside the virtnet_send_{r,t}x_ctrl_coal_vq_cmd.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

268762d0bbe778952ebda77a9ae8b8b3b584ae61