Merge branch 'debian/master' into ubuntu/master

1 files changed, 69 insertions, 74 deletions

diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h
index b106ebd5..da14bcd4 100644
--- a/libnm-core/nm-setting-dcb.h
+++ b/libnm-core/nm-setting-dcb.h
@@ -1,4 +1,4 @@
-// SPDX-License-Identifier: LGPL-2.1+
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /*
  * Copyright (C) 2013 Red Hat, Inc.
  */
@@ -6,20 +6,22 @@
 #ifndef __NM_SETTING_DCB_H__
 #define __NM_SETTING_DCB_H__
 
-#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
-#error "Only <NetworkManager.h> can be included directly."
+#if !defined(__NETWORKMANAGER_H_INSIDE__) && !defined(NETWORKMANAGER_COMPILATION)
+    #error "Only <NetworkManager.h> can be included directly."
 #endif
 
 #include "nm-setting.h"
 
 G_BEGIN_DECLS
 
-#define NM_TYPE_SETTING_DCB            (nm_setting_dcb_get_type ())
-#define NM_SETTING_DCB(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_DCB, NMSettingDcb))
-#define NM_SETTING_DCB_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_DCB, NMSettingDcbClass))
-#define NM_IS_SETTING_DCB(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_DCB))
-#define NM_IS_SETTING_DCB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SETTING_DCB))
-#define NM_SETTING_DCB_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_DCB, NMSettingDcbClass))
+#define NM_TYPE_SETTING_DCB (nm_setting_dcb_get_type())
+#define NM_SETTING_DCB(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_SETTING_DCB, NMSettingDcb))
+#define NM_SETTING_DCB_CLASS(klass) \
+    (G_TYPE_CHECK_CLASS_CAST((klass), NM_TYPE_SETTING_DCB, NMSettingDcbClass))
+#define NM_IS_SETTING_DCB(obj)         (G_TYPE_CHECK_INSTANCE_TYPE((obj), NM_TYPE_SETTING_DCB))
+#define NM_IS_SETTING_DCB_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), NM_TYPE_SETTING_DCB))
+#define NM_SETTING_DCB_GET_CLASS(obj) \
+    (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING_DCB, NMSettingDcbClass))
 
 #define NM_SETTING_DCB_SETTING_NAME "dcb"
 
@@ -34,10 +36,10 @@ G_BEGIN_DECLS
  * DCB feature flags.
  **/
 typedef enum { /*< flags >*/
-	NM_SETTING_DCB_FLAG_NONE      = 0x00000000,
-	NM_SETTING_DCB_FLAG_ENABLE    = 0x00000001,
-	NM_SETTING_DCB_FLAG_ADVERTISE = 0x00000002,
-	NM_SETTING_DCB_FLAG_WILLING   = 0x00000004
+               NM_SETTING_DCB_FLAG_NONE      = 0x00000000,
+               NM_SETTING_DCB_FLAG_ENABLE    = 0x00000001,
+               NM_SETTING_DCB_FLAG_ADVERTISE = 0x00000002,
+               NM_SETTING_DCB_FLAG_WILLING   = 0x00000004
 } NMSettingDcbFlags;
 
 /**
@@ -45,28 +47,28 @@ typedef enum { /*< flags >*/
  *
  * Indicates that the FCoE controller should use "fabric" mode (default)
  */
-#define NM_SETTING_DCB_FCOE_MODE_FABRIC  "fabric"
+#define NM_SETTING_DCB_FCOE_MODE_FABRIC "fabric"
 
 /**
  * NM_SETTING_DCB_FCOE_MODE_VN2VN:
  *
  * Indicates that the FCoE controller should use "VN2VN" mode.
  */
-#define NM_SETTING_DCB_FCOE_MODE_VN2VN   "vn2vn"
+#define NM_SETTING_DCB_FCOE_MODE_VN2VN "vn2vn"
 
 /* Properties */
-#define NM_SETTING_DCB_APP_FCOE_FLAGS         "app-fcoe-flags"
-#define NM_SETTING_DCB_APP_FCOE_PRIORITY      "app-fcoe-priority"
-#define NM_SETTING_DCB_APP_FCOE_MODE          "app-fcoe-mode"
+#define NM_SETTING_DCB_APP_FCOE_FLAGS    "app-fcoe-flags"
+#define NM_SETTING_DCB_APP_FCOE_PRIORITY "app-fcoe-priority"
+#define NM_SETTING_DCB_APP_FCOE_MODE     "app-fcoe-mode"
 
-#define NM_SETTING_DCB_APP_ISCSI_FLAGS        "app-iscsi-flags"
-#define NM_SETTING_DCB_APP_ISCSI_PRIORITY     "app-iscsi-priority"
+#define NM_SETTING_DCB_APP_ISCSI_FLAGS    "app-iscsi-flags"
+#define NM_SETTING_DCB_APP_ISCSI_PRIORITY "app-iscsi-priority"
 
-#define NM_SETTING_DCB_APP_FIP_FLAGS          "app-fip-flags"
-#define NM_SETTING_DCB_APP_FIP_PRIORITY       "app-fip-priority"
+#define NM_SETTING_DCB_APP_FIP_FLAGS    "app-fip-flags"
+#define NM_SETTING_DCB_APP_FIP_PRIORITY "app-fip-priority"
 
-#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS  "priority-flow-control-flags"
-#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL        "priority-flow-control"
+#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS "priority-flow-control-flags"
+#define NM_SETTING_DCB_PRIORITY_FLOW_CONTROL       "priority-flow-control"
 
 #define NM_SETTING_DCB_PRIORITY_GROUP_FLAGS      "priority-group-flags"
 #define NM_SETTING_DCB_PRIORITY_GROUP_ID         "priority-group-id"
@@ -81,70 +83,63 @@ typedef enum { /*< flags >*/
  * Data Center Bridging Settings
  */
 struct _NMSettingDcb {
-	NMSetting parent;
+    NMSetting parent;
 };
 
 typedef struct {
-	NMSettingClass parent;
+    NMSettingClass parent;
 
-	/*< private >*/
-	gpointer padding[4];
+    /*< private >*/
+    gpointer padding[4];
 } NMSettingDcbClass;
 
-GType nm_setting_dcb_get_type (void);
+GType nm_setting_dcb_get_type(void);
 
-NMSetting *       nm_setting_dcb_new                      (void);
+NMSetting *nm_setting_dcb_new(void);
 
-NMSettingDcbFlags nm_setting_dcb_get_app_fcoe_flags     (NMSettingDcb *setting);
-int               nm_setting_dcb_get_app_fcoe_priority  (NMSettingDcb *setting);
-const char *      nm_setting_dcb_get_app_fcoe_mode      (NMSettingDcb *setting);
+NMSettingDcbFlags nm_setting_dcb_get_app_fcoe_flags(NMSettingDcb *setting);
+int               nm_setting_dcb_get_app_fcoe_priority(NMSettingDcb *setting);
+const char *      nm_setting_dcb_get_app_fcoe_mode(NMSettingDcb *setting);
 
-NMSettingDcbFlags nm_setting_dcb_get_app_iscsi_flags    (NMSettingDcb *setting);
-int               nm_setting_dcb_get_app_iscsi_priority (NMSettingDcb *setting);
+NMSettingDcbFlags nm_setting_dcb_get_app_iscsi_flags(NMSettingDcb *setting);
+int               nm_setting_dcb_get_app_iscsi_priority(NMSettingDcb *setting);
 
-NMSettingDcbFlags nm_setting_dcb_get_app_fip_flags      (NMSettingDcb *setting);
-int               nm_setting_dcb_get_app_fip_priority   (NMSettingDcb *setting);
+NMSettingDcbFlags nm_setting_dcb_get_app_fip_flags(NMSettingDcb *setting);
+int               nm_setting_dcb_get_app_fip_priority(NMSettingDcb *setting);
 
 /* Priority Flow Control */
-NMSettingDcbFlags nm_setting_dcb_get_priority_flow_control_flags    (NMSettingDcb *setting);
-gboolean          nm_setting_dcb_get_priority_flow_control          (NMSettingDcb *setting,
-                                                                     guint user_priority);
-void              nm_setting_dcb_set_priority_flow_control          (NMSettingDcb *setting,
-                                                                     guint user_priority,
-                                                                     gboolean enabled);
+NMSettingDcbFlags nm_setting_dcb_get_priority_flow_control_flags(NMSettingDcb *setting);
+gboolean nm_setting_dcb_get_priority_flow_control(NMSettingDcb *setting, guint user_priority);
+void     nm_setting_dcb_set_priority_flow_control(NMSettingDcb *setting,
+                                                  guint         user_priority,
+                                                  gboolean      enabled);
 
 /* Priority Groups */
-NMSettingDcbFlags nm_setting_dcb_get_priority_group_flags (NMSettingDcb *setting);
-
-guint    nm_setting_dcb_get_priority_group_id         (NMSettingDcb *setting,
-                                                       guint user_priority);
-void     nm_setting_dcb_set_priority_group_id         (NMSettingDcb *setting,
-                                                       guint user_priority,
-                                                       guint group_id);
-
-guint    nm_setting_dcb_get_priority_group_bandwidth  (NMSettingDcb *setting,
-                                                       guint group_id);
-void     nm_setting_dcb_set_priority_group_bandwidth  (NMSettingDcb *setting,
-                                                       guint group_id,
-                                                       guint bandwidth_percent);
-
-guint    nm_setting_dcb_get_priority_bandwidth        (NMSettingDcb *setting,
-                                                       guint user_priority);
-void     nm_setting_dcb_set_priority_bandwidth        (NMSettingDcb *setting,
-                                                       guint user_priority,
-                                                       guint bandwidth_percent);
-
-gboolean nm_setting_dcb_get_priority_strict_bandwidth (NMSettingDcb *setting,
-                                                       guint user_priority);
-void     nm_setting_dcb_set_priority_strict_bandwidth (NMSettingDcb *setting,
-                                                       guint user_priority,
-                                                       gboolean strict);
-
-guint    nm_setting_dcb_get_priority_traffic_class    (NMSettingDcb *setting,
-                                                       guint user_priority);
-void     nm_setting_dcb_set_priority_traffic_class    (NMSettingDcb *setting,
-                                                       guint user_priority,
-                                                       guint traffic_class);
+NMSettingDcbFlags nm_setting_dcb_get_priority_group_flags(NMSettingDcb *setting);
+
+guint nm_setting_dcb_get_priority_group_id(NMSettingDcb *setting, guint user_priority);
+void
+nm_setting_dcb_set_priority_group_id(NMSettingDcb *setting, guint user_priority, guint group_id);
+
+guint nm_setting_dcb_get_priority_group_bandwidth(NMSettingDcb *setting, guint group_id);
+void  nm_setting_dcb_set_priority_group_bandwidth(NMSettingDcb *setting,
+                                                  guint         group_id,
+                                                  guint         bandwidth_percent);
+
+guint nm_setting_dcb_get_priority_bandwidth(NMSettingDcb *setting, guint user_priority);
+void  nm_setting_dcb_set_priority_bandwidth(NMSettingDcb *setting,
+                                            guint         user_priority,
+                                            guint         bandwidth_percent);
+
+gboolean nm_setting_dcb_get_priority_strict_bandwidth(NMSettingDcb *setting, guint user_priority);
+void     nm_setting_dcb_set_priority_strict_bandwidth(NMSettingDcb *setting,
+                                                      guint         user_priority,
+                                                      gboolean      strict);
+
+guint nm_setting_dcb_get_priority_traffic_class(NMSettingDcb *setting, guint user_priority);
+void  nm_setting_dcb_set_priority_traffic_class(NMSettingDcb *setting,
+                                                guint         user_priority,
+                                                guint         traffic_class);
 
 G_END_DECLS