From: David S. Miller Date: Fri, 26 Jan 2018 15:58:30 +0000 (-0500) Subject: Merge branch 'hns3-next' X-Git-Tag: for-linus-20180210~31^2~37 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2d0a527ed395f0e685f61167a752d80ddce31ace;p=linux-2.6-block.git Merge branch 'hns3-next' Peng Li says: ==================== net: hns3: add support ethtool_ops.{set|get}_coalesce for VF This patch-set adds ethtool_ops.{get|set}_coalesce to VF and fix one related bug. HNS3 PF and VF driver use the common enet layer, as the ethtool_ops.{get|set}_coalesce to PF have upstreamed, just need add the ops to hns3vf_ethtool_ops. [Patch 1/2] fix a related bug for the VF ethtool_ops.{set| get}_coalesce. ==================== Signed-off-by: David S. Miller --- 2d0a527ed395f0e685f61167a752d80ddce31ace