diff options
| author | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:42 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2024-05-05 00:07:42 +0200 |
| commit | a9c892f6640668b93848584d246280c4d33cc025 (patch) | |
| tree | 914226b8c8fffd1a8e101e71d361d6d126322c12 /src/libnm-lldp | |
| parent | f03946fe0cdd73041658be1009f06f0e287c4b80 (diff) | |
| parent | 34bb501be08aa2b313d88e67d6e0a7e0a3f9cfa6 (diff) | |
Update upstream source from tag 'upstream/1.47.90'
Update to upstream version '1.47.90' with Debian dir fca683c43690f5e2bfc191d3d528666444bec54b
Diffstat (limited to 'src/libnm-lldp')
| -rw-r--r-- | src/libnm-lldp/nm-lldp-neighbor.c | 3 | ||||
| -rw-r--r-- | src/libnm-lldp/nm-lldp-network.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libnm-lldp/nm-lldp-neighbor.c b/src/libnm-lldp/nm-lldp-neighbor.c index a2a9695e..0379cf38 100644 --- a/src/libnm-lldp/nm-lldp-neighbor.c +++ b/src/libnm-lldp/nm-lldp-neighbor.c @@ -648,9 +648,10 @@ nm_lldp_neighbor_tlv_get_oui(NMLldpNeighbor *n, uint8_t oui[static 3], uint8_t * int r; g_return_val_if_fail(n, -EINVAL); - g_return_val_if_fail(oui, -EINVAL); g_return_val_if_fail(subtype, -EINVAL); + nm_assert(oui); + r = nm_lldp_neighbor_tlv_is_type(n, NM_LLDP_TYPE_PRIVATE); if (r < 0) return r; diff --git a/src/libnm-lldp/nm-lldp-network.c b/src/libnm-lldp/nm-lldp-network.c index 811c3a72..28cc7452 100644 --- a/src/libnm-lldp/nm-lldp-network.c +++ b/src/libnm-lldp/nm-lldp-network.c @@ -46,7 +46,7 @@ nm_lldp_network_bind_raw_socket(int ifindex) assert(ifindex > 0); - fd = socket(AF_PACKET, SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK, htobe16(NM_ETHERTYPE_LLDP)); + fd = socket(AF_PACKET, SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK, htobe16(ETH_P_ALL)); if (fd < 0) return -errno; |