summaryrefslogtreecommitdiff
path: root/drivers/block/aoe/aoecmd.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2008-07-23 13:19:00 (GMT)
committerJiri Kosina <jkosina@suse.cz>2008-07-23 13:19:00 (GMT)
commit9063974cdbc5463528cb6aa60c91bc0267af7bbb (patch)
tree1dffc62d8b79b3d89459cf23aa59c553e186840a /drivers/block/aoe/aoecmd.c
parentd6d6a86e14a6b5a26c785b45268874a8f7a52b4d (diff)
parentc010b2f76c3032e48097a6eef291d8593d5d79a6 (diff)
downloadlinux-9063974cdbc5463528cb6aa60c91bc0267af7bbb.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block/aoe/aoecmd.c')
-rw-r--r--drivers/block/aoe/aoecmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 41f818b..2f17462 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -1003,7 +1003,7 @@ aoecmd_cfg_rsp(struct sk_buff *skb)
* Enough people have their dip switches set backwards to
* warrant a loud message for this special case.
*/
- aoemajor = be16_to_cpu(get_unaligned(&h->major));
+ aoemajor = get_unaligned_be16(&h->major);
if (aoemajor == 0xfff) {
printk(KERN_ERR "aoe: Warning: shelf address is all ones. "
"Check shelf dip switches.\n");