shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

Merge pull request #12301 from keszybz/silence-alignment-warning

Browse Source 
Silence alignment warning
This commit is contained in:
Lennart Poettering 2019-04-15 11:21:15 +02:00 committed by GitHub
commit 929b02b5b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd/sd-netlink/generic-netlink.c
View File

@ -10,11 +10,11 @@ typedef struct {
} genl_family;
static const genl_family genl_families[] = {
[SD_GENL_ID_CTRL] = { .name = "", .version = 1 },
[SD_GENL_ID_CTRL] = { .name = "", .version = 1 },
[SD_GENL_WIREGUARD] = { .name = "wireguard", .version = 1 },
[SD_GENL_FOU] = { .name = "fou", .version = 1 },
[SD_GENL_L2TP] = { .name = "l2tp", .version = 1},
[SD_GENL_MACSEC] = { .name = "macsec", .version = 1},
[SD_GENL_FOU] = { .name = "fou", .version = 1 },
[SD_GENL_L2TP] = { .name = "l2tp", .version = 1 },
[SD_GENL_MACSEC] = { .name = "macsec", .version = 1 },
};
int sd_genl_socket_open(sd_netlink **ret) {

4
src/network/netdev/macsec.c
View File

@ -563,7 +563,7 @@ int config_parse_macsec_port(
_cleanup_(macsec_receive_channel_free_or_set_invalidp) ReceiveChannel *c = NULL;
MACsec *s = userdata;
uint16_t port;
be16_t *dest;
void *dest;
int r;
assert(filename);
@ -600,7 +600,7 @@ int config_parse_macsec_port(
return 0;
}
*dest = htobe16(port);
unaligned_write_be16(dest, port);
TAKE_PTR(b);
TAKE_PTR(c);