From 8bdf070ff046f482f6eb5e2b15ebc216f5d1e3da Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 12 Feb 2025 13:46:50 +0100 Subject: New upstream version 1.51.90 --- src/libnm-lldp/nm-lldp-rx.c | 2 +- src/libnm-lldp/nm-lldp.h | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src/libnm-lldp') diff --git a/src/libnm-lldp/nm-lldp-rx.c b/src/libnm-lldp/nm-lldp-rx.c index 90414b3e..f1b5b47c 100644 --- a/src/libnm-lldp/nm-lldp-rx.c +++ b/src/libnm-lldp/nm-lldp-rx.c @@ -411,7 +411,7 @@ nm_lldp_rx_new(const NMLldpRXConfig *config) G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(NMLldpNeighbor, id) == 0); lldp_rx = g_slice_new(NMLldpRX); - *lldp_rx = (NMLldpRX){ + *lldp_rx = (NMLldpRX) { .ref_count = 1, .fd = -1, .main_context = g_main_context_ref_thread_default(), diff --git a/src/libnm-lldp/nm-lldp.h b/src/libnm-lldp/nm-lldp.h index 55e7de29..aaf87dcb 100644 --- a/src/libnm-lldp/nm-lldp.h +++ b/src/libnm-lldp/nm-lldp.h @@ -63,16 +63,8 @@ enum { | NM_LLDP_SYSTEM_CAPABILITIES_DOCSIS | NM_LLDP_SYSTEM_CAPABILITIES_CVLAN \ | NM_LLDP_SYSTEM_CAPABILITIES_SVLAN | NM_LLDP_SYSTEM_CAPABILITIES_TPMR)) -#define NM_LLDP_OUI_802_1 \ - (const uint8_t[]) \ - { \ - 0x00, 0x80, 0xc2 \ - } -#define NM_LLDP_OUI_802_3 \ - (const uint8_t[]) \ - { \ - 0x00, 0x12, 0x0f \ - } +#define NM_LLDP_OUI_802_1 (const uint8_t[]){0x00, 0x80, 0xc2} +#define NM_LLDP_OUI_802_3 (const uint8_t[]){0x00, 0x12, 0x0f} #define _SD_LLDP_OUI_IANA 0x00, 0x00, 0x5E #define NM_LLDP_OUI_IANA \ -- cgit 1.3.0-6-gf8a5