diff options
author | Ed L. Cashin <ecashin@coraid.com> | 2008-02-08 07:20:01 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-08 12:22:31 -0500 |
commit | 1eb0da4cea28ae8f1bbe61822a2cc04e6d074e03 (patch) | |
tree | 5f5e63711244ee845fe1bfb4faf1116605d0e053 /drivers/block/aoe/aoenet.c | |
parent | 68e0d42f39d85b334d3867a4e5fc2e0e775c1a6c (diff) |
aoe: mac_addr: avoid 64-bit arch compiler warnings
By returning unsigned long long, mac_addr does not generate compiler warnings
on 64-bit architectures.
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block/aoe/aoenet.c')
-rw-r--r-- | drivers/block/aoe/aoenet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c index 7a38a45ce11..ada4a06645e 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c | |||
@@ -83,7 +83,7 @@ set_aoe_iflist(const char __user *user_str, size_t size) | |||
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |
85 | 85 | ||
86 | u64 | 86 | unsigned long long |
87 | mac_addr(char addr[6]) | 87 | mac_addr(char addr[6]) |
88 | { | 88 | { |
89 | __be64 n = 0; | 89 | __be64 n = 0; |
@@ -91,7 +91,7 @@ mac_addr(char addr[6]) | |||
91 | 91 | ||
92 | memcpy(p + 2, addr, 6); /* (sizeof addr != 6) */ | 92 | memcpy(p + 2, addr, 6); /* (sizeof addr != 6) */ |
93 | 93 | ||
94 | return __be64_to_cpu(n); | 94 | return (unsigned long long) __be64_to_cpu(n); |
95 | } | 95 | } |
96 | 96 | ||
97 | void | 97 | void |