From c333f062ddcba9b35330647bf6cbd0a07f2d786e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 11 May 2017 14:55:55 +0200 Subject: New upstream version 1.8.0 --- docs/libnm/html/NMSettingVlan.html | 89 +++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 44 deletions(-) (limited to 'docs/libnm/html/NMSettingVlan.html') diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html index ec8eb58b..7451a21d 100644 --- a/docs/libnm/html/NMSettingVlan.html +++ b/docs/libnm/html/NMSettingVlan.html @@ -58,7 +58,7 @@ -guint32 +guint32 nm_setting_vlan_get_id () @@ -66,7 +66,7 @@ -guint32 +guint32 nm_setting_vlan_get_flags () @@ -74,7 +74,7 @@ -gint32 +gint32 nm_setting_vlan_get_num_priorities () @@ -82,7 +82,7 @@ -gboolean +gboolean nm_setting_vlan_get_priority () @@ -90,7 +90,7 @@ -gboolean +gboolean nm_setting_vlan_add_priority () @@ -106,7 +106,7 @@ -gboolean +gboolean nm_setting_vlan_remove_priority_by_value () @@ -114,7 +114,7 @@ -gboolean +gboolean nm_setting_vlan_remove_priority_str_by_value () @@ -130,7 +130,7 @@ -gboolean +gboolean nm_setting_vlan_add_priority_str () @@ -149,7 +149,7 @@ -GStrv +GStrv egress-priority-map Read / Write @@ -159,18 +159,18 @@ Read / Write / Construct -guint +guint id Read / Write / Construct -GStrv +GStrv ingress-priority-map Read / Write -gchar * +gchar * parent Read / Write / Construct @@ -230,11 +230,11 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── NMVlanPriorityMap
-    GFlags
+    GFlags
     ╰── NMVlanFlags
-    GObject
+    GObject
     ╰── NMSetting
         ╰── NMSettingVlan
 

@@ -285,7 +285,7 @@ nm_setting_vlan_get_parent (
 
nm_setting_vlan_get_id ()

-
guint32
+
guint32
 nm_setting_vlan_get_id (NMSettingVlan *setting);

 

 
Parameters

@@ -310,7 +310,7 @@ nm_setting_vlan_get_id (
 
nm_setting_vlan_get_flags ()

-
guint32
+
guint32
 nm_setting_vlan_get_flags (NMSettingVlan *setting);

 

 
Parameters

@@ -335,10 +335,10 @@ nm_setting_vlan_get_flags (
 
nm_setting_vlan_get_num_priorities ()

-
gint32
+
gint32
 nm_setting_vlan_get_num_priorities (NMSettingVlan *setting,
                                     NMVlanPriorityMap map);

-
Returns the number of entires in the
+
Returns the number of entries in the
 “ingress_priority_map” or “egress_priority_map”
 properties of this setting.

 

@@ -371,12 +371,12 @@ properties of this setting.

 

 

 
nm_setting_vlan_get_priority ()

-
gboolean
+
gboolean
 nm_setting_vlan_get_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 idx,
-                              guint32 *out_from,
-                              guint32 *out_to);

+                              guint32 idx,
+                              guint32 *out_from,
+                              guint32 *out_to);

 
Retrieve one of the entries of the “ingress_priority_map”
 or “egress_priority_map” properties of this setting.

 

@@ -418,17 +418,17 @@ or 
 

 
Returns

-
 TRUE if a priority map was returned, FALSE if error

+
 TRUE if a priority map was returned, FALSE if error

 

 

 

 

 
nm_setting_vlan_add_priority ()

-
gboolean
+
gboolean
 nm_setting_vlan_add_priority (NMSettingVlan *setting,
                               NMVlanPriorityMap map,
-                              guint32 from,
-                              guint32 to);

+                              guint32 from,
+                              guint32 to);

 
Adds a priority mapping to the “ingress_priority_map” or
 “egress_priority_map” properties of the setting. If from
  is
@@ -481,8 +481,8 @@ to

 

 

 
Returns

-
 TRUE if the new priority mapping was successfully added to the
-list, FALSE if error

+
 TRUE if the new priority mapping was successfully added to the
+list, FALSE if error

 

 

 

@@ -491,7 +491,7 @@ list, void
 nm_setting_vlan_remove_priority (NMSettingVlan *setting,
                                  NMVlanPriorityMap map,
-                                 guint32 idx);

+                                 guint32 idx);

 
Removes the priority map at index idx
  from the
 “ingress_priority_map” or “egress_priority_map”
@@ -527,12 +527,12 @@ properties.

 

 

 
nm_setting_vlan_remove_priority_by_value ()

-
gboolean
+
gboolean
 nm_setting_vlan_remove_priority_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
-                                guint32 from,
-                                guint32 to);

+                                guint32 from,
+                                guint32 to);

 
Removes the priority map form
 :to
  from the “ingress_priority_map”
@@ -575,13 +575,13 @@ to

 

 

 
Returns

-
 TRUE if the priority mapping was found and removed; FALSE if it was not.

+
 TRUE if the priority mapping was found and removed; FALSE if it was not.

 

 

 

 

 
nm_setting_vlan_remove_priority_str_by_value ()

-
gboolean
+
gboolean
 nm_setting_vlan_remove_priority_str_by_value
                                (NMSettingVlan *setting,
                                 NMVlanPriorityMap map,
@@ -620,7 +620,7 @@ properties.

 

 

 
Returns

-
 TRUE if the priority mapping was found and removed; FALSE if it was not.

+
 TRUE if the priority mapping was found and removed; FALSE if it was not.
@@ -629,7 +629,7 @@ properties.

void
 nm_setting_vlan_clear_priorities (NMSettingVlan *setting,
                                   NMVlanPriorityMap map);
-

Clear all the entires from “ingress_priority_map” or +

Clear all the entries from “ingress_priority_map” or “egress_priority_map” properties.

Parameters

@@ -657,7 +657,7 @@ nm_setting_vlan_clear_priorities (

nm_setting_vlan_add_priority_str ()

-
gboolean
+
gboolean
 nm_setting_vlan_add_priority_str (NMSettingVlan *setting,
                                   NMVlanPriorityMap map,
                                   const char *str);

@@ -693,8 +693,8 @@ the Linux SKB priorities to 802.1p priorities.

Returns

-

TRUE if the entry was successfully added to the list, or it -overwrote the old value, FALSE if error

+

TRUE if the entry was successfully added to the list, or it +overwrote the old value, FALSE if error

@@ -739,6 +739,7 @@ overwrote the old value,

NMSettingVlan

typedef struct _NMSettingVlan NMSettingVlan;
+

VLAN Settings

@@ -832,7 +833,7 @@ to 802.1p priorities used in VLANs.

Property Details

The “egress-priority-map” property

-
  “egress-priority-map”      GStrv
+
  “egress-priority-map”      GStrv

For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p priorities. The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".

@@ -858,7 +859,7 @@ is still considered as 0.

The “id” property

-
  “id”                       guint
+
  “id”                       guint

The VLAN identifier that the interface created by this connection should be assigned. The valid range is from 0 to 4094, without the reserved id 4095.

Flags: Read / Write / Construct

@@ -868,7 +869,7 @@ be assigned. The valid range is from 0 to 4094, without the reserved id 4095.

The “ingress-priority-map” property

-
  “ingress-priority-map”     GStrv
+
  “ingress-priority-map”     GStrv

For incoming packets, a list of mappings from 802.1p priorities to Linux SKB priorities. The mapping is given in the format "from:to" where both "from" and "to" are unsigned integers, ie "7:3".

@@ -877,7 +878,7 @@ SKB priorities. The mapping is given in the format "from:to" where both

The “parent” property

-
  “parent”                   gchar *
+
  “parent”                   gchar *

If given, specifies the parent interface name or parent connection UUID from which this VLAN interface should be created. If this property is not specified, the connection must contain an NMSettingWired setting -- cgit 1.3.0-6-gf8a5