diff options
| author | Rob Herring <robh@kernel.org> | 2018-12-13 20:20:36 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2018-12-13 20:20:36 +0300 |
| commit | acc2038738bd6f881e7a277ba14fa7c589fd3058 (patch) | |
| tree | fd56524867a9b726b3e5d2cb040ff16b2f2a67a0 /drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | |
| parent | cd1cc0bef46fc8d8f9ebe82d2064d4f4bd5ecf16 (diff) | |
| parent | 2c9b0b00af23cdc70d28d82e077dc1d280bcb84a (diff) | |
| download | linux-acc2038738bd6f881e7a277ba14fa7c589fd3058.tar.xz | |
Merge branch 'yaml-bindings-for-v4.21' into dt/next
Diffstat (limited to 'drivers/net/ethernet/hisilicon/hns3/hns3_enet.c')
| -rw-r--r-- | drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 3f96aa30068e..20fcf0d1c2ce 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -3760,7 +3760,8 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle) /* Hardware table is only clear when pf resets */ if (!(handle->flags & HNAE3_SUPPORT_VF)) { ret = hns3_restore_vlan(netdev); - return ret; + if (ret) + return ret; } ret = hns3_restore_fd_rules(netdev); |