diff options
| author | Simon Wunderlich <sw@simonwunderlich.de> | 2013-12-02 20:38:31 +0100 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-12-28 12:51:16 +0100 |
| commit | a40d9b075c21f06872de3f05cc2eb3d06665e2ff (patch) | |
| tree | 85aefae654246aa4f89e046bb0bca6b5b85b76f6 /net/batman-adv/icmp_socket.c | |
| parent | 46b76e0b8b5e21fa5a2387d6f72b193514e7f722 (diff) | |
| download | blackbird-op-linux-a40d9b075c21f06872de3f05cc2eb3d06665e2ff.tar.gz blackbird-op-linux-a40d9b075c21f06872de3f05cc2eb3d06665e2ff.zip | |
batman-adv: fix header alignment by unrolling batadv_header
The size of the batadv_header of 3 is problematic on some architectures
which automatically pad all structures to a 32 bit boundary. To not lose
performance by packing this struct, better embed it into the various
host structures.
Reported-by: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
Diffstat (limited to 'net/batman-adv/icmp_socket.c')
| -rw-r--r-- | net/batman-adv/icmp_socket.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c index 29ae4efe3543..130cc3217e2b 100644 --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@ -194,7 +194,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, goto free_skb; } - if (icmp_header->header.packet_type != BATADV_ICMP) { + if (icmp_header->packet_type != BATADV_ICMP) { batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); len = -EINVAL; @@ -243,9 +243,9 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, icmp_header->uid = socket_client->index; - if (icmp_header->header.version != BATADV_COMPAT_VERSION) { + if (icmp_header->version != BATADV_COMPAT_VERSION) { icmp_header->msg_type = BATADV_PARAMETER_PROBLEM; - icmp_header->header.version = BATADV_COMPAT_VERSION; + icmp_header->version = BATADV_COMPAT_VERSION; batadv_socket_add_packet(socket_client, icmp_header, packet_len); goto free_skb; |
