diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dev.c b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dev.c
index e04e2902b70d85fe2417355198beb2ebdace5342..fa9ec0077bf13fd1e960403dfdd9e5f253c331e4 100644
--- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dev.c
+++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dev.c
@@ -2065,6 +2065,16 @@ nbl_dev_netdev_set_vf_vlan(struct net_device *netdev, int vf_id, u16 vlan, u8 pr
 	return serv_ops->set_vf_vlan(netdev, vf_id, vlan, pri, proto);
 }
 
+static int
+nbl_dev_netdev_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)
+{
+	struct nbl_adapter *adapter = NBL_NETDEV_TO_ADAPTER(netdev);
+	struct nbl_dev_mgt *dev_mgt = NBL_ADAPTER_TO_DEV_MGT(adapter);
+	struct nbl_service_ops *serv_ops = NBL_DEV_MGT_TO_SERV_OPS(dev_mgt);
+
+	return serv_ops->set_vf_trust(netdev, vf_id, trusted);
+}
+
 static int
 nbl_dev_netdev_setup_tc(struct net_device *netdev, enum tc_setup_type type, void *type_data)
 {
@@ -2216,6 +2226,7 @@ static const struct net_device_ops netdev_ops_leonis_pf = {
 	.ndo_get_vf_stats = nbl_dev_netdev_get_vf_stats,
 	.ndo_select_queue = nbl_dev_netdev_select_queue,
 	.ndo_set_vf_vlan = nbl_dev_netdev_set_vf_vlan,
+	.ndo_set_vf_trust = nbl_dev_netdev_set_vf_trust,
 	.ndo_setup_tc = nbl_dev_netdev_setup_tc,
 	.ndo_change_mtu = nbl_dev_netdev_change_mtu,
 	.ndo_get_phys_port_name = nbl_dev_ndo_get_phys_port_name,
diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_tc_tun.c b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_tc_tun.c
index 7f5325c8aafb564e4ebefd6e884f05aee781a74f..f2f703955f0ef713431047fb1cf12dc39a5a7cb6 100644
--- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_tc_tun.c
+++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_tc_tun.c
@@ -342,10 +342,10 @@ static int nbl_route_lookup_ipv6(const struct nbl_common_info *common,
 	}
 
 	dev_hold(real_out_dev);
-
+#ifdef CONFIG_IPV6
 	if (!tun_route_info->ttl)
 		tun_route_info->ttl = (u8)ip6_dst_hoplimit(dst);
-
+#endif
 	n = dst_neigh_lookup(dst, &tun_route_info->fl.fl6.daddr);
 	if (!n) {
 		ret = -ENONET;