Skip to content

Commit ee60e62

Browse files
fpokryvkkuba-moo
authored andcommitted
netdevsim: don't overwrite read only ethtool parms
Ethtool ring feature has _max_pending attributes read-only. Set only read-write attributes in nsim_set_ringparam. This patch is useful, if netdevsim device is set-up using NetworkManager, because NetworkManager sends 0 as MAX values, as it is pointless to retrieve them in extra call, because they should be read-only. Then, the device is left in incosistent state (value > MAX). Fixes: a7fc6db ("netdevsim: support ethtool ring and coalesce settings") Signed-off-by: Filip Pokryvka <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 94f2a44 commit ee60e62

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/net/netdevsim/ethtool.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@ static int nsim_set_ringparam(struct net_device *dev,
7777
{
7878
struct netdevsim *ns = netdev_priv(dev);
7979

80-
memcpy(&ns->ethtool.ring, ring, sizeof(ns->ethtool.ring));
80+
ns->ethtool.ring.rx_pending = ring->rx_pending;
81+
ns->ethtool.ring.rx_jumbo_pending = ring->rx_jumbo_pending;
82+
ns->ethtool.ring.rx_mini_pending = ring->rx_mini_pending;
83+
ns->ethtool.ring.tx_pending = ring->tx_pending;
8184
return 0;
8285
}
8386

0 commit comments

Comments
 (0)