projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
ipv6.h
diff --git
a/include/linux/ipv6.h
b/include/linux/ipv6.h
index ab9e9e89e4074318405a595c1147642e344255c0..e62683ba88e6824e72b3e8c81c7315998868f606 100644
(file)
--- a/
include/linux/ipv6.h
+++ b/
include/linux/ipv6.h
@@
-58,7
+58,7
@@
struct ipv6_opt_hdr {
/*
* TLV encoded option data follows.
*/
/*
* TLV encoded option data follows.
*/
-} __
packed;
/* required for some archs */
+} __
attribute__((packed));
/* required for some archs */
#define ipv6_destopt_hdr ipv6_opt_hdr
#define ipv6_hopopt_hdr ipv6_opt_hdr
#define ipv6_destopt_hdr ipv6_opt_hdr
#define ipv6_hopopt_hdr ipv6_opt_hdr
@@
-99,7
+99,7
@@
struct ipv6_destopt_hao {
__u8 type;
__u8 length;
struct in6_addr addr;
__u8 type;
__u8 length;
struct in6_addr addr;
-} __
packed
;
+} __
attribute__((packed))
;
/*
* IPv6 fixed header
/*
* IPv6 fixed header