diff options
| author |   Changli Gao <xiaosuo@gmail.com> | 2010-08-22 17:25:05 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-08-22 21:15:39 -0700 |
| commit | 09cd2b99c6cdd1e14e84c1febca2fb91e9f4e5ba (patch) | |
| tree | 87d9c912d5d73a1017773a5b0d30d564e8a7895c /include/linux/phonet.h | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (diff) | |
| download | linux-dev-09cd2b99c6cdd1e14e84c1febca2fb91e9f4e5ba.tar.xz linux-dev-09cd2b99c6cdd1e14e84c1febca2fb91e9f4e5ba.zip | |
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.h | 4 |
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 { __be16 pn_length; __u8 pn_robj; __u8 pn_sobj; -} __packed; +} __attribute__((packed)); /* Common Phonet payload header */ struct phonetmsg { @@ -98,7 +98,7 @@ struct sockaddr_pn { __u8 spn_dev; __u8 spn_resource; __u8 spn_zero[sizeof(struct sockaddr) - sizeof(sa_family_t) - 3]; -} __packed; +} __attribute__((packed)); /* Well known address */ #define PN_DEV_PC 0x10 |