net: hns3: bugfix for not checking return value

Huazhong Tan · davem330 · commit e12c225258f2 · 2018-11-08T16:23:49.000-08:00
hns3_reset_notify_init_enet() only return error early if the return value of hns3_restore_vlan() is not 0. This patch adds checking for the return value of hns3_restore_vlan. Fixes: 7fa6be4 ("net: hns3: fix incorrect return value/type of some functions") Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -3760,7 +3760,8 @@ static int hns3_reset_notify_init_enet(struct hnae3_handle *handle)`
`3760`	`3760`	`/* Hardware table is only clear when pf resets */`
`3761`	`3761`	`if (!(handle->flags & HNAE3_SUPPORT_VF)) {`
`3762`	`3762`	`ret = hns3_restore_vlan(netdev);`
`3763`		`- return ret;`
	`3763`	`+ if (ret)`
	`3764`	`+ return ret;`
`3764`	`3765`	`}`
`3765`	`3766`
`3766`	`3767`	`ret = hns3_restore_fd_rules(netdev);`