diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-04-15 11:21:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 11:21:15 +0200 |
| commit | 929b02b5b8a5191f02e5362f125ae9506641cec0 (patch) | |
| tree | 90e4132edab86b9803f4d1ef5e67003bb264a66d | |
| parent | a4009bee4acc7eff9832531ec47db57d063455a8 (diff) | |
| parent | b48ccda84f82470c449cbaeb1fca191b6c14bc6e (diff) | |
| download | systemd-929b02b5b8a5191f02e5362f125ae9506641cec0.tar.gz | |
Merge pull request #12301 from keszybz/silence-alignment-warning
Silence alignment warning
| -rw-r--r-- | src/libsystemd/sd-netlink/generic-netlink.c | 8 | ||||
| -rw-r--r-- | src/network/netdev/macsec.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libsystemd/sd-netlink/generic-netlink.c b/src/libsystemd/sd-netlink/generic-netlink.c index 473d8670a9..5467f62ffa 100644 --- a/src/libsystemd/sd-netlink/generic-netlink.c +++ b/src/libsystemd/sd-netlink/generic-netlink.c @@ -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) { diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c index 15b5378f30..ccc37cded4 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -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); |