aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/netlink.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-03-23 14:56:33 +0100
committerTakashi Iwai <tiwai@suse.de>2010-03-23 14:56:33 +0100
commit85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch)
treef9eaa974b88b9db09dab9e5f6876e87d12543fe4 /include/net/netlink.h
parent6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff)
parent306ff3e473a970f88680e8355c0900fcab0357e2 (diff)
downloadkernel_samsung_aries-85ae01b2da0ed606a2e8d840aadef90fd30220a1.zip
kernel_samsung_aries-85ae01b2da0ed606a2e8d840aadef90fd30220a1.tar.gz
kernel_samsung_aries-85ae01b2da0ed606a2e8d840aadef90fd30220a1.tar.bz2
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'include/net/netlink.h')
-rw-r--r--include/net/netlink.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h
index f82e463..4fc05b5 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -945,7 +945,11 @@ static inline u64 nla_get_u64(const struct nlattr *nla)
*/
static inline __be64 nla_get_be64(const struct nlattr *nla)
{
- return *(__be64 *) nla_data(nla);
+ __be64 tmp;
+
+ nla_memcpy(&tmp, nla, sizeof(tmp));
+
+ return tmp;
}
/**