tree ec83b6febfcaa9b2b7c756b9ef38c59c7806ce9b
parent fc458dcda27c6d26cb11ef9ee9c1c3599711be94
author [EMAIL PROTECTED] <[EMAIL PROTECTED]> Tue, 19 Apr 2005 12:00:18 -0700
committer Greg KH <[EMAIL PROTECTED]> Tue, 19 Apr 2005 12:00:18 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
block/aoe/aoe.h | 2 +-
block/aoe/aoecmd.c | 9 +++++----
block/aoe/aoedev.c | 5 ++---
3 files changed, 8 insertions(+), 8 deletions(-)
Index: drivers/block/aoe/aoe.h
===================================================================
--- a54d1b213653dc992a1700a96b5805b72e687028/drivers/block/aoe/aoe.h
(mode:100644 sha1:551dd8e5b14b2a71e590f6419d83f708de034d69)
+++ ec83b6febfcaa9b2b7c756b9ef38c59c7806ce9b/drivers/block/aoe/aoe.h
(mode:100644 sha1:ae16a21aca5cae6f6920515ee814c2a3c9e3a811)
@@ -156,7 +156,7 @@
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);
Index: drivers/block/aoe/aoecmd.c
===================================================================
--- a54d1b213653dc992a1700a96b5805b72e687028/drivers/block/aoe/aoecmd.c
(mode:100644 sha1:1b711a52dd252fe25606814e21d709271607e9b1)
+++ ec83b6febfcaa9b2b7c756b9ef38c59c7806ce9b/drivers/block/aoe/aoecmd.c
(mode:100644 sha1:5d437697c368582f3acc1b017e1f43a6bfb2fc6a)
@@ -380,14 +380,15 @@
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;
}
Index: drivers/block/aoe/aoedev.c
===================================================================
--- a54d1b213653dc992a1700a96b5805b72e687028/drivers/block/aoe/aoedev.c
(mode:100644 sha1:240abaec159b708d90065f7643bb6b8fb2697fac)
+++ ec83b6febfcaa9b2b7c756b9ef38c59c7806ce9b/drivers/block/aoe/aoedev.c
(mode:100644 sha1:a40a78a7f44a4ffabebbf45826cdf612cafab470)
@@ -13,7 +13,7 @@
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 @@
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 @@
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);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
