New upstream version 1.45.90 upstream/1.45.90

1 files changed, 12 insertions, 4 deletions

diff --git a/src/libnm-platform/nmp-base.h b/src/libnm-platform/nmp-base.h
index ffe59363..70b5d1bc 100644
--- a/src/libnm-platform/nmp-base.h
+++ b/src/libnm-platform/nmp-base.h
@@ -93,16 +93,12 @@ typedef struct {
     const NMEthtoolFeatureState states_list[];
 } NMEthtoolFeatureStates;
 
-/*****************************************************************************/
-
 typedef struct {
     guint32
         s[_NM_ETHTOOL_ID_COALESCE_NUM /* indexed by (NMEthtoolID - _NM_ETHTOOL_ID_COALESCE_FIRST) */
     ];
 } NMEthtoolCoalesceState;
 
-/*****************************************************************************/
-
 typedef struct {
     guint32 rx_pending;
     guint32 rx_mini_pending;
@@ -116,6 +112,17 @@ typedef struct {
     bool tx : 1;
 } NMEthtoolPauseState;
 
+typedef struct {
+    guint32 rx;
+    guint32 tx;
+    guint32 other;
+    guint32 combined;
+} NMEthtoolChannelsState;
+
+typedef struct {
+    bool enabled : 1;
+} NMEthtoolEEEState;
+
 /*****************************************************************************/
 
 typedef struct _NMPNetns                 NMPNetns;
@@ -152,6 +159,7 @@ typedef enum _nm_packed {
     NMP_OBJECT_TYPE_LNK_BRIDGE,
     NMP_OBJECT_TYPE_LNK_GRE,
     NMP_OBJECT_TYPE_LNK_GRETAP,
+    NMP_OBJECT_TYPE_LNK_HSR,
     NMP_OBJECT_TYPE_LNK_INFINIBAND,
     NMP_OBJECT_TYPE_LNK_IP6TNL,
     NMP_OBJECT_TYPE_LNK_IP6GRE,