diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-20 15:24:29 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-20 15:24:29 -0700 |
| commit | e77c8e83dd587f2616d7ff20d23a897891e6e20d (patch) | |
| tree | ba5d2ce6541119f329b2fd51181aaae8528b38f0 /include/net/netlink.h | |
| parent | 641cb85e68945878d520d5fc3c2dc64aa1dda868 (diff) | |
| parent | af98441397227a5a4f212cd48710eea72a14dbdb (diff) | |
| download | linux-e77c8e83dd587f2616d7ff20d23a897891e6e20d.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 f82e463c875a..4fc05b58503e 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; } /** |