summaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorHannes Frederic Sowa <hannes@stressinduktion.org>2015-03-24 11:05:28 +0100
committerDavid S. Miller <davem@davemloft.net>2015-03-24 15:21:35 -0400
commitff40217e73fd137daae0113ed71b218128913037 (patch)
treef725df0e1069ba55cd9ff3d23b433931ddcd4379 /net/ipv6
parented3e852aa5039fda5a9f53c716c7466913403288 (diff)
ipv6: fix sparse warnings in privacy stable addresses generation
Those warnings reported by sparse endianness check (via kbuild test robot) are harmless, nevertheless fix them up and make the code a little bit easier to read. Reported-by: kbuild test robot <fengguang.wu@intel.com> Fixes: 622c81d57b392cc ("ipv6: generation of stable privacy addresses for link-local and autoconf") Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index d2d238334a11..2660263e1131 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -2906,7 +2906,7 @@ static int ipv6_generate_stable_address(struct in6_addr *address,
char __data[SHA_MESSAGE_BYTES];
struct {
struct in6_addr secret;
- __be64 prefix;
+ __be32 prefix[2];
unsigned char hwaddr[MAX_ADDR_LEN];
u8 dad_count;
} __packed;
@@ -2932,16 +2932,16 @@ retry:
memset(&data, 0, sizeof(data));
memset(workspace, 0, sizeof(workspace));
memcpy(data.hwaddr, idev->dev->perm_addr, idev->dev->addr_len);
- data.prefix = ((__be64)address->s6_addr32[0] << 32) |
- (__be64)address->s6_addr32[1];
+ data.prefix[0] = address->s6_addr32[0];
+ data.prefix[1] = address->s6_addr32[1];
data.secret = secret;
data.dad_count = dad_count;
sha_transform(digest, data.__data, workspace);
temp = *address;
- temp.s6_addr32[2] = digest[0];
- temp.s6_addr32[3] = digest[1];
+ temp.s6_addr32[2] = (__force __be32)digest[0];
+ temp.s6_addr32[3] = (__force __be32)digest[1];
spin_unlock_bh(&lock);