about summary refs log tree commit diff
path: root/src/nm-system.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-02-09 03:22:03 +0100
committerMichael Biebl <biebl@debian.org>2013-02-09 03:22:03 +0100
commit78efcd2dfec5b6c56c50b1f8e44ed7c61c14553d (patch)
treec21aecab13151f626c3b2230ca21cda818c99484 /src/nm-system.h
parent681370ed77af598691a15eba55b17beb2edc9459 (diff)
parente17c5736fc3722ce51cb33f3edb203960125a4c1 (diff)
Merge tag 'upstream/0.9.7.997' into experimental
Upstream version 0.9.7.997
Diffstat (limited to 'src/nm-system.h')
-rw-r--r--src/nm-system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nm-system.h b/src/nm-system.h
index ca07d0f2..632786d3 100644
--- a/src/nm-system.h
+++ b/src/nm-system.h
@@ -128,7 +128,7 @@ gboolean        nm_system_add_vlan_iface (NMConnection *connection,
                                           int parent_ifindex);
 gboolean        nm_system_del_vlan_iface (const char *iface);
 
-gboolean        nm_system_create_bridge (const char *iface);
+gboolean        nm_system_create_bridge (const char *iface, gboolean *out_exists);
 gboolean        nm_system_del_bridge (const char *iface);
 
 gboolean        nm_system_bridge_attach (int master_ifindex,