From: ecashin@noserose.net
To: linux-kernel@vger.kernel.org
Subject: [PATCH 2.6.11] aoe [2/12]: allow multiple aoe devices with same MAC addr
Date: Thu, 24 Mar 2005 07:09:57 -0800 [thread overview]
Message-ID: <1111676997.25277@geode.he.net> (raw)
In-Reply-To: 20050317234641.GA7091@kroah.com
allow multiple aoe devices with same MAC addr
Signed-off-by: Ed L. Cashin <ecashin@coraid.com>
diff -uprN a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h
--- a/drivers/block/aoe/aoe.h 2005-03-10 12:19:04.000000000 -0500
+++ b/drivers/block/aoe/aoe.h 2005-03-10 12:19:11.000000000 -0500
@@ -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 -uprN a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
--- a/drivers/block/aoe/aoecmd.c 2005-03-10 12:19:04.000000000 -0500
+++ b/drivers/block/aoe/aoecmd.c 2005-03-10 12:19:11.000000000 -0500
@@ -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 -uprN a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
--- a/drivers/block/aoe/aoedev.c 2005-03-07 17:37:14.000000000 -0500
+++ b/drivers/block/aoe/aoedev.c 2005-03-10 12:19:11.000000000 -0500
@@ -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
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);
--
Ed L. Cashin <ecashin@coraid.com>
next prev parent reply other threads:[~2005-03-24 15:10 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87mztbi79d.fsf@coraid.com>
2005-03-17 23:46 ` [PATCH 2.6.11] aoe [1/12]: remove too-low cap on minor number Greg KH
2005-03-18 20:13 ` Ed L Cashin
2005-03-18 20:14 ` [PATCH 2.6.11] aoe [4/12]: handle distros that have a udev rules file instead of dir Ed L. Cashin
2005-03-24 14:59 ` [PATCH 2.6.11] aoe [1/12]: remove too-low cap on minor number ecashin
2005-03-24 15:09 ` ecashin [this message]
2005-03-24 15:13 ` [PATCH 2.6.11] aoe [3/12]: update driver version to 6 ecashin
2005-03-24 15:15 ` [PATCH 2.6.11] aoe [4/12]: handle distros that have a udev rules file instead of dir ecashin
2005-03-24 15:17 ` [PATCH 2.6.11] aoe [5/12]: don't try to free null bufpool ecashin
2005-03-24 15:58 ` Arjan van de Ven
2005-03-24 17:04 ` ecashin
2005-03-24 17:17 ` Arjan van de Ven
2005-03-25 14:37 ` Jesper Juhl
2005-03-29 12:31 ` Jens Axboe
2005-03-24 15:19 ` [PATCH 2.6.11] aoe [6/12]: Alexey Dobriyan sparse cleanup ecashin
2005-03-24 15:21 ` [PATCH 2.6.11] aoe [7/12]: support configuration of AOE_PARTITIONS from Kconfig ecashin
2005-03-28 17:07 ` Christoph Hellwig
2005-03-29 16:06 ` Ed L Cashin
2005-03-29 16:25 ` Christoph Hellwig
2005-03-29 16:48 ` Ed L Cashin
2005-03-29 16:57 ` Christoph Hellwig
2005-04-07 18:28 ` Ed L Cashin
2005-04-07 18:49 ` Greg KH
2005-04-07 18:56 ` Ed L Cashin
2005-04-07 23:08 ` Greg KH
2005-04-08 13:54 ` Ed L Cashin
2005-03-24 15:23 ` [PATCH 2.6.11] aoe [8/12]: document env var for specifying number of partitions per dev ecashin
2005-03-24 15:25 ` [PATCH 2.6.11] aoe [9/12]: add note about the need for deadlock-free sk_buff allocation ecashin
2005-03-24 15:27 ` [PATCH 2.6.11] aoe [10/12]: Randy Dunlap: avoid warnings on sparc64 ecashin
2005-03-24 15:30 ` [PATCH 2.6.11] aoe [11/12]: add support for disk statistics ecashin
2005-03-24 15:32 ` [PATCH 2.6.11] aoe [12/12]: send outgoing packets in order ecashin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1111676997.25277@geode.he.net \
--to=ecashin@noserose.net \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.