Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ed L. Cashin and committed by
Linus Torvalds
1eb0da4c 68e0d42f

+9 -10
+1 -1
drivers/block/aoe/aoe.h
··· 198 198 int is_aoe_netif(struct net_device *ifp); 199 199 int set_aoe_iflist(const char __user *str, size_t size); 200 200 201 - u64 mac_addr(char addr[6]); 201 + unsigned long long mac_addr(char addr[6]);
+1 -2
drivers/block/aoe/aoeblk.c
··· 37 37 38 38 if (t == NULL) 39 39 return snprintf(page, PAGE_SIZE, "none\n"); 40 - return snprintf(page, PAGE_SIZE, "%012llx\n", 41 - (unsigned long long)mac_addr(t->addr)); 40 + return snprintf(page, PAGE_SIZE, "%012llx\n", mac_addr(t->addr)); 42 41 } 43 42 static ssize_t aoedisk_show_netif(struct device *dev, 44 43 struct device_attribute *attr, char *page)
+5 -5
drivers/block/aoe/aoecmd.c
··· 309 309 "%15s e%ld.%d oldtag=%08x@%08lx newtag=%08x " 310 310 "s=%012llx d=%012llx nout=%d\n", 311 311 "retransmit", d->aoemajor, d->aoeminor, f->tag, jiffies, n, 312 - mac_addr(h->src), mac_addr(h->dst), t->nout); 312 + mac_addr(h->src), 313 + mac_addr(h->dst), t->nout); 313 314 aoechr_error(buf); 314 315 315 316 f->tag = n; ··· 634 633 635 634 if (d->ssize != ssize) 636 635 printk(KERN_INFO "aoe: %012llx e%lu.%lu v%04x has %llu sectors\n", 637 - (unsigned long long)mac_addr(t->addr), 636 + mac_addr(t->addr), 638 637 d->aoemajor, d->aoeminor, 639 638 d->fw_ver, (long long)ssize); 640 639 d->ssize = ssize; ··· 728 727 t = gettgt(d, hin->src); 729 728 if (t == NULL) { 730 729 printk(KERN_INFO "aoe: can't find target e%ld.%d:%012llx\n", 731 - d->aoemajor, d->aoeminor, 732 - (unsigned long long) mac_addr(hin->src)); 730 + d->aoemajor, d->aoeminor, mac_addr(hin->src)); 733 731 spin_unlock_irqrestore(&d->lock, flags); 734 732 return; 735 733 } ··· 1003 1003 "aoe: e%ld.%d: setting %d%s%s:%012llx\n", 1004 1004 d->aoemajor, d->aoeminor, n, 1005 1005 " byte data frames on ", ifp->nd->name, 1006 - (unsigned long long) mac_addr(t->addr)); 1006 + mac_addr(t->addr)); 1007 1007 ifp->maxbcnt = n; 1008 1008 } 1009 1009 }
+2 -2
drivers/block/aoe/aoenet.c
··· 83 83 return 0; 84 84 } 85 85 86 - u64 86 + unsigned long long 87 87 mac_addr(char addr[6]) 88 88 { 89 89 __be64 n = 0; ··· 91 91 92 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 97 void