| Message ID | 20200311223302.2171564-3-kuba@kernel.org |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | ethtool: consolidate irq coalescing - part 4 | expand |
> -----Original Message----- > From: Jakub Kicinski <kuba@kernel.org> > Sent: Thursday, March 12, 2020 12:33 AM > To: davem@davemloft.net > Subject: [PATCH net-next 02/15] net: dpaa: reject unsupported coalescing > params > > Set ethtool_ops->supported_coalesce_params to let > the core reject unsupported coalescing parameters. > > This driver did not previously reject unsupported parameters > (other than adaptive rx, which will now be rejected by core). > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Madalin Bucur <madalin.bucur@oss.nxp.com> > --- > drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c > b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c > index 6aa1fa22cd04..9db2a02fb531 100644 > --- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c > +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c > @@ -525,7 +525,6 @@ static int dpaa_get_coalesce(struct net_device *dev, > > c->rx_coalesce_usecs = period; > c->rx_max_coalesced_frames = thresh; > - c->use_adaptive_rx_coalesce = false; > > return 0; > } > @@ -540,9 +539,6 @@ static int dpaa_set_coalesce(struct net_device *dev, > u8 thresh, prev_thresh; > int cpu, res; > > - if (c->use_adaptive_rx_coalesce) > - return -EINVAL; > - > period = c->rx_coalesce_usecs; > thresh = c->rx_max_coalesced_frames; > > @@ -582,6 +578,8 @@ static int dpaa_set_coalesce(struct net_device *dev, > } > > const struct ethtool_ops dpaa_ethtool_ops = { > + .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS | > + ETHTOOL_COALESCE_RX_MAX_FRAMES, > .get_drvinfo = dpaa_get_drvinfo, > .get_msglevel = dpaa_get_msglevel, > .set_msglevel = dpaa_set_msglevel, > -- > 2.24.1
diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c index 6aa1fa22cd04..9db2a02fb531 100644 --- a/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c @@ -525,7 +525,6 @@ static int dpaa_get_coalesce(struct net_device *dev, c->rx_coalesce_usecs = period; c->rx_max_coalesced_frames = thresh; - c->use_adaptive_rx_coalesce = false; return 0; } @@ -540,9 +539,6 @@ static int dpaa_set_coalesce(struct net_device *dev, u8 thresh, prev_thresh; int cpu, res; - if (c->use_adaptive_rx_coalesce) - return -EINVAL; - period = c->rx_coalesce_usecs; thresh = c->rx_max_coalesced_frames; @@ -582,6 +578,8 @@ static int dpaa_set_coalesce(struct net_device *dev, } const struct ethtool_ops dpaa_ethtool_ops = { + .supported_coalesce_params = ETHTOOL_COALESCE_RX_USECS | + ETHTOOL_COALESCE_RX_MAX_FRAMES, .get_drvinfo = dpaa_get_drvinfo, .get_msglevel = dpaa_get_msglevel, .set_msglevel = dpaa_set_msglevel,
Set ethtool_ops->supported_coalesce_params to let the core reject unsupported coalescing parameters. This driver did not previously reject unsupported parameters (other than adaptive rx, which will now be rejected by core). Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)