diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-08-05 23:59:40 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-08-06 00:08:47 +0200 |
| commit | 0ca8d3ca4561535f97b31e7b8de569c69bc3b27b (patch) | |
| tree | fb452bc7d0fa536caea8b0a6eb00af1975ae5ba2 /drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | |
| parent | netdevsim: Forbid devlink reload when adding or deleting ports (diff) | |
| parent | Merge tag 'net-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-0ca8d3ca4561535f97b31e7b8de569c69bc3b27b.tar.xz linux-0ca8d3ca4561535f97b31e7b8de569c69bc3b27b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Build failure in drivers/net/wwan/mhi_wwan_mbim.c:
add missing parameter (0, assuming we don't want buffer pre-alloc).
Conflict in drivers/net/dsa/sja1105/sja1105_main.c between:
589918df9322 ("net: dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too")
0fac6aa098ed ("net: dsa: sja1105: delete the best_effort_vlan_filtering mode")
Follow the instructions from the commit message of the former commit
- removed the if conditions. When looking at commit 589918df9322 ("net:
dsa: sja1105: be stateless with FDB entries on SJA1105P/Q/R/S/SJA1110 too")
note that the mask_iotag fields get removed by the following patch.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c index a213784ffa54..0bf2ff5717bc 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c @@ -286,6 +286,8 @@ nfp_net_get_link_ksettings(struct net_device *netdev, /* Init to unknowns */ ethtool_link_ksettings_add_link_mode(cmd, supported, FIBRE); + ethtool_link_ksettings_add_link_mode(cmd, supported, Pause); + ethtool_link_ksettings_add_link_mode(cmd, advertising, Pause); cmd->base.port = PORT_OTHER; cmd->base.speed = SPEED_UNKNOWN; cmd->base.duplex = DUPLEX_UNKNOWN; |