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

[PATCH] aoe: allow multiple aoe devices to have the same mac

allow multiple aoe devices to have the same mac

Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff -u b/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c

authored by

Ed L Cashin and committed by
Greg KH
93d489fc 67d9f847

+4 -7
+4 -7
drivers/block/aoe/aoedev.c
··· 109 109 spin_lock_irqsave(&devlist_lock, flags); 110 110 111 111 for (d=devlist; d; d=d->next) 112 - if (d->sysminor == sysminor 113 - || memcmp(d->addr, addr, sizeof d->addr) == 0) 112 + if (d->sysminor == sysminor) 114 113 break; 115 114 116 115 if (d == NULL && (d = aoedev_newdev(bufcnt)) == NULL) { 117 116 spin_unlock_irqrestore(&devlist_lock, flags); 118 117 printk(KERN_INFO "aoe: aoedev_set: aoedev_newdev failure.\n"); 119 118 return NULL; 120 - } 119 + } /* if newdev, (d->flags & DEVFL_UP) == 0 for below */ 121 120 122 121 spin_unlock_irqrestore(&devlist_lock, flags); 123 122 spin_lock_irqsave(&d->lock, flags); 124 123 125 124 d->ifp = ifp; 126 - 127 - if (d->sysminor != sysminor 128 - || (d->flags & DEVFL_UP) == 0) { 125 + memcpy(d->addr, addr, sizeof d->addr); 126 + if ((d->flags & DEVFL_UP) == 0) { 129 127 aoedev_downdev(d); /* flushes outstanding frames */ 130 - memcpy(d->addr, addr, sizeof d->addr); 131 128 d->sysminor = sysminor; 132 129 d->aoemajor = AOEMAJOR(sysminor); 133 130 d->aoeminor = AOEMINOR(sysminor);