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/mhi_net.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/mhi_net.c')
| -rw-r--r-- | drivers/net/mhi_net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mhi_net.c b/drivers/net/mhi_net.c index d127eb6e9257..975f7f9bdf4c 100644 --- a/drivers/net/mhi_net.c +++ b/drivers/net/mhi_net.c @@ -319,7 +319,7 @@ static int mhi_net_newlink(struct mhi_device *mhi_dev, struct net_device *ndev) u64_stats_init(&mhi_netdev->stats.tx_syncp); /* Start MHI channels */ - err = mhi_prepare_for_transfer(mhi_dev); + err = mhi_prepare_for_transfer(mhi_dev, 0); if (err) goto out_err; |