From: David S. Miller <davem@davemloft.net>
Date: Tue, 10 Oct 2017 20:09:14 +0000 (-0700)
Subject: Merge branch 'hnx3-rxnfc'
X-Git-Tag: iommu-v4.15-rc3~11^2~497
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=59d43876719ac46902b2a0f98217b430156d0d37;p=users%2Fdwmw2%2Flinux.git

Merge branch 'hnx3-rxnfc'

Lipeng says:

====================
Support set_ringparam and {set|get}_rxnfc ethtool commands

1, Patch [1/5,2/5] add support for ethtool ops set_ringparam
   (ethtool -G) and fix related bug.
2, Patch [3/5,4/5, 5/5] add support for ethtool ops
   set_rxnfc/get_rxnfc (-n/-N) and fix related bug.
====================

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

59d43876719ac46902b2a0f98217b430156d0d37