diff options
author | Ameen Ali <ameenali023@gmail.com> | 2015-02-22 16:40:36 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-22 17:01:22 -0500 |
commit | e099b2d9dfe25583e1ecf98bd31a9f12c2ec1b74 (patch) | |
tree | ce4fe208a45397d20cbe0e384c6d1a041bc8a994 | |
parent | 92b839175064632813a7c4b7e180efde4c08c850 (diff) |
net: __aligned(size) is preferred over __attribute__((aligned(size)))
Signed-off-by: Ameen Ali <AmeenAli023@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/compat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/compat.c b/net/compat.c index 3236b4167a32..49c6a8fb9f09 100644 --- a/net/compat.c +++ b/net/compat.c | |||
@@ -508,25 +508,25 @@ COMPAT_SYSCALL_DEFINE5(getsockopt, int, fd, int, level, int, optname, | |||
508 | struct compat_group_req { | 508 | struct compat_group_req { |
509 | __u32 gr_interface; | 509 | __u32 gr_interface; |
510 | struct __kernel_sockaddr_storage gr_group | 510 | struct __kernel_sockaddr_storage gr_group |
511 | __attribute__ ((aligned(4))); | 511 | __aligned(4); |
512 | } __packed; | 512 | } __packed; |
513 | 513 | ||
514 | struct compat_group_source_req { | 514 | struct compat_group_source_req { |
515 | __u32 gsr_interface; | 515 | __u32 gsr_interface; |
516 | struct __kernel_sockaddr_storage gsr_group | 516 | struct __kernel_sockaddr_storage gsr_group |
517 | __attribute__ ((aligned(4))); | 517 | __aligned(4); |
518 | struct __kernel_sockaddr_storage gsr_source | 518 | struct __kernel_sockaddr_storage gsr_source |
519 | __attribute__ ((aligned(4))); | 519 | __aligned(4); |
520 | } __packed; | 520 | } __packed; |
521 | 521 | ||
522 | struct compat_group_filter { | 522 | struct compat_group_filter { |
523 | __u32 gf_interface; | 523 | __u32 gf_interface; |
524 | struct __kernel_sockaddr_storage gf_group | 524 | struct __kernel_sockaddr_storage gf_group |
525 | __attribute__ ((aligned(4))); | 525 | __aligned(4); |
526 | __u32 gf_fmode; | 526 | __u32 gf_fmode; |
527 | __u32 gf_numsrc; | 527 | __u32 gf_numsrc; |
528 | struct __kernel_sockaddr_storage gf_slist[1] | 528 | struct __kernel_sockaddr_storage gf_slist[1] |
529 | __attribute__ ((aligned(4))); | 529 | __aligned(4); |
530 | } __packed; | 530 | } __packed; |
531 | 531 | ||
532 | #define __COMPAT_GF0_SIZE (sizeof(struct compat_group_filter) - \ | 532 | #define __COMPAT_GF0_SIZE (sizeof(struct compat_group_filter) - \ |