From: John Tyner <jtyner@cs.ucr.edu>
To: <linuxppc-embedded@lists.linuxppc.org>
Subject: [PATCH] fix ibm ocp ifconfig oops (for real this time)
Date: Tue, 14 May 2002 16:30:09 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.30.0205141628280.29257-101000@hill.cs.ucr.edu> (raw)
[-- Attachment #1: Type: TEXT/PLAIN, Size: 1103 bytes --]
Here is a shorter patch that actually works. Please disregard my last one.
--- drivers/net/ibm_ocp/ibm_ocp_enet.c Tue May 14 16:24:17 2002
+++ drivers/net/ibm_ocp/ibm_ocp_enet.c Tue May 14 16:25:58 2002
@@ -244,14 +244,11 @@
fep = (struct fec_enet_private *) EMAC_DEV(ocpdev);
emacp = (emac_t *) EMAC_DEV(paddr);
} else {
- if ((emac_driver =
- ocp_alloc_dev(sizeof (struct fec_enet_private))) == NULL)
- return -ENOMEM;
+ emac_driver = ( struct ocp_driver *)dev->priv;
strcpy(emac_driver->name, "emac");
emac_driver->type = EMAC;
/* this returns the next emac number */
if ((emac_num = ocp_register(emac_driver)) >= 0) {
- dev->priv = (void *) emac_driver;
emac_driver->priv_index = dev->ifindex;
emacp =
(emac_t *) ((struct ocp_driver *) dev->priv)->paddr;
@@ -676,6 +673,10 @@
dev->set_multicast_list = &ppc405_enet_set_multicast_list;
dev->do_ioctl = &fec_enet_ioctl;
emac_dev[curr_emac] = dev;
+
+ if ((dev->priv =
+ ocp_alloc_dev(sizeof (struct fec_enet_private))) == NULL)
+ return -ENOMEM;
}
for (i = 0; i < NMII - 1; i++)
[-- Attachment #2: Type: APPLICATION/octet-stream, Size: 522 bytes --]
next reply other threads:[~2002-05-14 23:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-05-14 23:30 John Tyner [this message]
2002-05-14 23:47 ` [PATCH] fix ibm ocp ifconfig oops (for real this time) Armin
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=Pine.LNX.4.30.0205141628280.29257-101000@hill.cs.ucr.edu \
--to=jtyner@cs.ucr.edu \
--cc=linuxppc-embedded@lists.linuxppc.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).