summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/sb1250-mac.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-08-05 23:59:40 +0200
committerJakub Kicinski <kuba@kernel.org>2021-08-06 00:08:47 +0200
commit0ca8d3ca4561535f97b31e7b8de569c69bc3b27b (patch)
treefb452bc7d0fa536caea8b0a6eb00af1975ae5ba2 /drivers/net/ethernet/broadcom/sb1250-mac.c
parentnetdevsim: Forbid devlink reload when adding or deleting ports (diff)
parentMerge tag 'net-5.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff)
downloadlinux-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/broadcom/sb1250-mac.c')
0 files changed, 0 insertions, 0 deletions