diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-04-17 10:42:54 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-04-17 11:08:07 -0700 |
| commit | 8203c7ce4ef2840929d38b447b4ccd384727f92b (patch) | |
| tree | 07b4079057e035a4063788f120665f5e42967e8e /net/ethtool | |
| parent | 474f459360399c5becfd0f189a8894e9e17ad3d3 (diff) | |
| parent | 88a5af943985fb43b4c9472b5abd9c0b9705533d (diff) | |
| download | lwn-8203c7ce4ef2840929d38b447b4ccd384727f92b.tar.gz lwn-8203c7ce4ef2840929d38b447b4ccd384727f92b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
- keep the ZC code, drop the code related to reinit
net/bridge/netfilter/ebtables.c
- fix build after move to net_generic
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/ethtool')
| -rw-r--r-- | net/ethtool/netlink.h | 6 | ||||
| -rw-r--r-- | net/ethtool/pause.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/net/ethtool/netlink.h b/net/ethtool/netlink.h index bed3afdf3656..8abcbc10796c 100644 --- a/net/ethtool/netlink.h +++ b/net/ethtool/netlink.h @@ -36,9 +36,9 @@ static inline int ethnl_strz_size(const char *s) /** * ethnl_put_strz() - put string attribute with fixed size string - * @skb: skb with the message - * @attrype: attribute type - * @s: ETH_GSTRING_LEN sized string (may not be null terminated) + * @skb: skb with the message + * @attrtype: attribute type + * @s: ETH_GSTRING_LEN sized string (may not be null terminated) * * Puts an attribute with null terminated string from @s into the message. * diff --git a/net/ethtool/pause.c b/net/ethtool/pause.c index f1967c121278..9009f412151e 100644 --- a/net/ethtool/pause.c +++ b/net/ethtool/pause.c @@ -32,16 +32,16 @@ static int pause_prepare_data(const struct ethnl_req_info *req_base, if (!dev->ethtool_ops->get_pauseparam) return -EOPNOTSUPP; + ethtool_stats_init((u64 *)&data->pausestat, + sizeof(data->pausestat) / 8); + ret = ethnl_ops_begin(dev); if (ret < 0) return ret; dev->ethtool_ops->get_pauseparam(dev, &data->pauseparam); if (req_base->flags & ETHTOOL_FLAG_STATS && - dev->ethtool_ops->get_pause_stats) { - ethtool_stats_init((u64 *)&data->pausestat, - sizeof(data->pausestat) / 8); + dev->ethtool_ops->get_pause_stats) dev->ethtool_ops->get_pause_stats(dev, &data->pausestat); - } ethnl_ops_complete(dev); return 0; |