Update upstream source from tag 'upstream/1.35.91'

Update to upstream version '1.35.91'
with Debian dir d8c1bf4c615814324dba64d19fe27402339c67f5

1 files changed, 7 insertions, 25 deletions

diff --git a/src/core/ppp/nm-ppp-manager-call.c b/src/core/ppp/nm-ppp-manager-call.c
index 5e84f596..8c788fad 100644
--- a/src/core/ppp/nm-ppp-manager-call.c
+++ b/src/core/ppp/nm-ppp-manager-call.c
@@ -25,9 +25,9 @@ static const NMPPPOps *_ppp_ops = NULL;
 NMPPPManager *
 nm_ppp_manager_create(const char *iface, GError **error)
 {
-    NMPPPManager *  ret;
-    GModule *       plugin;
-    GError *        error_local = NULL;
+    NMPPPManager   *ret;
+    GModule        *plugin;
+    GError         *error_local = NULL;
     struct stat     st;
     const NMPPPOps *ppp_ops;
 
@@ -94,31 +94,13 @@ again:
     return ret;
 }
 
-void
-nm_ppp_manager_set_route_parameters(NMPPPManager *self,
-                                    guint32       ip4_route_table,
-                                    guint32       ip4_route_metric,
-                                    guint32       ip6_route_table,
-                                    guint32       ip6_route_metric)
-{
-    const NMPPPOps *ppp_ops = ppp_ops_get();
-
-    g_return_if_fail(ppp_ops);
-
-    ppp_ops->set_route_parameters(self,
-                                  ip4_route_table,
-                                  ip4_route_metric,
-                                  ip6_route_table,
-                                  ip6_route_metric);
-}
-
 gboolean
 nm_ppp_manager_start(NMPPPManager *self,
                      NMActRequest *req,
-                     const char *  ppp_name,
+                     const char   *ppp_name,
                      guint32       timeout_secs,
                      guint         baud_override,
-                     GError **     err)
+                     GError      **err)
 {
     const NMPPPOps *ppp_ops = ppp_ops_get();
 
@@ -128,8 +110,8 @@ nm_ppp_manager_start(NMPPPManager *self,
 }
 
 NMPPPManagerStopHandle *
-nm_ppp_manager_stop(NMPPPManager *           self,
-                    GCancellable *           cancellable,
+nm_ppp_manager_stop(NMPPPManager            *self,
+                    GCancellable            *cancellable,
                     NMPPPManagerStopCallback callback,
                     gpointer                 user_data)
 {