diff options
author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2016-07-13 20:08:56 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-07-14 03:10:14 +0200 |
commit | f5d258e60722142e88cb6f0f337d78bca67cf973 (patch) | |
tree | 577c52e4af79b428a2c7ef33dc32d8be834de17c /include/net/sctp | |
parent | sctp: allow others to use sctp_input_cb (diff) | |
download | linux-f5d258e60722142e88cb6f0f337d78bca67cf973.tar.xz linux-f5d258e60722142e88cb6f0f337d78bca67cf973.zip |
sctp: reorder sctp_ulpevent and shrink msg_flags
The next patch needs 8 bytes in there. sctp_ulpevent has a hole due to
bad alignment; msg_flags is using 4 bytes while it actually uses only 2, so
we shrink it, and iif member (4 bytes) which can be easily fetched from
another place once the next patch is there, so we remove it and thus
creating space for 8 bytes.
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sctp')
-rw-r--r-- | include/net/sctp/ulpevent.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/sctp/ulpevent.h b/include/net/sctp/ulpevent.h index cccdcfd14973..aa342645dbce 100644 --- a/include/net/sctp/ulpevent.h +++ b/include/net/sctp/ulpevent.h @@ -48,15 +48,15 @@ */ struct sctp_ulpevent { struct sctp_association *asoc; - __u16 stream; - __u16 ssn; - __u16 flags; + unsigned int rmem_len; __u32 ppid; __u32 tsn; __u32 cumtsn; - int msg_flags; int iif; - unsigned int rmem_len; + __u16 stream; + __u16 ssn; + __u16 flags; + __u16 msg_flags; }; /* Retrieve the skb this event sits inside of. */ |