Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / drivers / block / aoe / aoenet.c

diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c
index 9157d64270cb041ba8b92bc462913439b12018e0..30de5b1c647e80b05007a22f1a4e0b79a38dcad4 100644 (file)
--- a/drivers/block/aoe/aoenet.c
+++ b/drivers/block/aoe/aoenet.c
@@ -83,17 +83,6 @@ set_aoe_iflist(const char __user *user_str, size_t size)
        return 0;
 }
 
-unsigned long long
-mac_addr(char addr[6])
-{
-       __be64 n = 0;
-       char *p = (char *) &n;
-
-       memcpy(p + 2, addr, 6); /* (sizeof addr != 6) */
-
-       return (unsigned long long) __be64_to_cpu(n);
-}
-
 void
 aoenet_xmit(struct sk_buff_head *queue)
 {