aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/phonet.h
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2010-08-22 13:25:05 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-23 00:15:39 -0400
commit09cd2b99c6cdd1e14e84c1febca2fb91e9f4e5ba (patch)
tree87d9c912d5d73a1017773a5b0d30d564e8a7895c /include/linux/phonet.h
parent48d3ff82698cb0094684aed70446e0a5cbb1a4d0 (diff)
header: fix broken headers for user space
__packed is only defined in kernel space, so we should use __attribute__((packed)) for the code shared between kernel and user space. Two __attribute() annotations are replaced with __attribute__() too. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/phonet.h')
-rw-r--r--include/linux/phonet.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/phonet.h b/include/linux/phonet.h
index 24426c3d6b5a..76edadf046d3 100644
--- a/include/linux/phonet.h
+++ b/include/linux/phonet.h
@@ -56,7 +56,7 @@ struct phonethdr {
56 __be16 pn_length; 56 __be16 pn_length;
57 __u8 pn_robj; 57 __u8 pn_robj;
58 __u8 pn_sobj; 58 __u8 pn_sobj;
59} __packed; 59} __attribute__((packed));
60 60
61/* Common Phonet payload header */ 61/* Common Phonet payload header */
62struct phonetmsg { 62struct phonetmsg {
@@ -98,7 +98,7 @@ struct sockaddr_pn {
98 __u8 spn_dev; 98 __u8 spn_dev;
99 __u8 spn_resource; 99 __u8 spn_resource;
100 __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; 100 __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3];
101} __packed; 101} __attribute__((packed));
102 102
103/* Well known address */ 103/* Well known address */
104#define PN_DEV_PC 0x10 104#define PN_DEV_PC 0x10