diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-03-23 09:56:33 -0400 |
commit | 85ae01b2da0ed606a2e8d840aadef90fd30220a1 (patch) | |
tree | f9eaa974b88b9db09dab9e5f6876e87d12543fe4 /include/net/netlink.h | |
parent | 6407d474e6ae6a798fa5ba40b32f508a52de80ff (diff) | |
parent | 306ff3e473a970f88680e8355c0900fcab0357e2 (diff) |
Merge remote branch 'alsa/devel' into topic/usb
Diffstat (limited to 'include/net/netlink.h')
-rw-r--r-- | include/net/netlink.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/netlink.h b/include/net/netlink.h index f82e463c875..4fc05b58503 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) | |||
945 | */ | 945 | */ |
946 | static inline __be64 nla_get_be64(const struct nlattr *nla) | 946 | static inline __be64 nla_get_be64(const struct nlattr *nla) |
947 | { | 947 | { |
948 | return *(__be64 *) nla_data(nla); | 948 | __be64 tmp; |
949 | |||
950 | nla_memcpy(&tmp, nla, sizeof(tmp)); | ||
951 | |||
952 | return tmp; | ||
949 | } | 953 | } |
950 | 954 | ||
951 | /** | 955 | /** |