diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-04-14 01:04:28 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-04-14 01:04:28 +0200 |
| commit | 800e68c44ffe71f9715f745b38fd1af6910b3773 (patch) | |
| tree | 898caef9a109e429776e65c1083d1503207bebed /drivers/net/ethernet/qlogic/qlcnic | |
| parent | Merge branch 'net-use-read_once-write_once-for-ring-index-accesses' (diff) | |
| parent | Merge tag 'net-6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-800e68c44ffe71f9715f745b38fd1af6910b3773.tar.xz linux-800e68c44ffe71f9715f745b38fd1af6910b3773.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Conflicts:
tools/testing/selftests/net/config
62199e3f1658 ("selftests: net: Add VXLAN MDB test")
3a0385be133e ("selftests: add the missing CONFIG_IP_SCTP in net config")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c index 87f76bac2e46..eb827b86ecae 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c @@ -628,7 +628,13 @@ int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev) int i, err, ring; if (dev->flags & QLCNIC_NEED_FLR) { - pci_reset_function(dev->pdev); + err = pci_reset_function(dev->pdev); + if (err) { + dev_err(&dev->pdev->dev, + "Adapter reset failed (%d). Please reboot\n", + err); + return err; + } dev->flags &= ~QLCNIC_NEED_FLR; } |