[PATCH] aoe 2/12: allow multiple aoe devices with same MAC

allow multiple aoe devices with same MAC addr

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

diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
index 551dd8e5b14b2a71e590f6419d83f708de034d69..ae16a21aca5cae6f6920515ee814c2a3c9e3a811 100644 (file)
--- a/drivers/block/aoe/aoe.h
+++ b/drivers/block/aoe/aoe.h
@@ -156,7 +156,7 @@ void aoecmd_cfg_rsp(struct sk_buff *);
 
 int aoedev_init(void);
 void aoedev_exit(void);
-struct aoedev *aoedev_bymac(unsigned char *);
+struct aoedev *aoedev_by_aoeaddr(int maj, int min);
 void aoedev_downdev(struct aoedev *d);
 struct aoedev *aoedev_set(ulong, unsigned char *, struct net_device *, ulong);
 int aoedev_busy(void);

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 1b711a52dd252fe25606814e21d709271607e9b1..5d437697c368582f3acc1b017e1f43a6bfb2fc6a 100644 (file)
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -380,14 +380,15 @@ aoecmd_ata_rsp(struct sk_buff *skb)
        register long n;
        ulong flags;
        char ebuf[128];
-       
+       u16 aoemajor;
+
        hin = (struct aoe_hdr *) skb->mac.raw;
-       d = aoedev_bymac(hin->src);
+       aoemajor = __be16_to_cpu(*((u16 *) hin->major));
+       d = aoedev_by_aoeaddr(aoemajor, hin->minor);
        if (d == NULL) {
                snprintf(ebuf, sizeof ebuf, "aoecmd_ata_rsp: ata response "
                        "for unknown device %d.%d\n",
-                        __be16_to_cpu(*((u16 *) hin->major)),
-                       hin->minor);
+                        aoemajor, hin->minor);
                aoechr_error(ebuf);
                return;
        }

diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index 240abaec159b708d90065f7643bb6b8fb2697fac..a40a78a7f44a4ffabebbf45826cdf612cafab470 100644 (file)
--- a/drivers/block/aoe/aoedev.c
+++ b/drivers/block/aoe/aoedev.c
@@ -13,7 +13,7 @@ static struct aoedev *devlist;
 static spinlock_t devlist_lock;
 
 struct aoedev *
-aoedev_bymac(unsigned char *macaddr)
+aoedev_by_aoeaddr(int maj, int min)
 {
        struct aoedev *d;
        ulong flags;
@@ -21,7 +21,7 @@ aoedev_bymac(unsigned char *macaddr)
        spin_lock_irqsave(&devlist_lock, flags);
 
        for (d=devlist; d; d=d->next)
-               if (!memcmp(d->addr, macaddr, 6))
+               if (d->aoemajor == maj && d->aoeminor == min)
                        break;
 
        spin_unlock_irqrestore(&devlist_lock, flags);
@@ -125,7 +125,6 @@ aoedev_set(ulong sysminor, unsigned char *addr, struct net_device *ifp, ulong bu
        d->ifp = ifp;
 
        if (d->sysminor != sysminor
-       || memcmp(d->addr, addr, sizeof d->addr)
        || (d->flags & DEVFL_UP) == 0) {
                aoedev_downdev(d); /* flushes outstanding frames */
                memcpy(d->addr, addr, sizeof d->addr);