From: "Rogério Brito" <rbrito@ime.usp.br>
To: David Miller <davem@davemloft.net>
Cc: linuxppc-dev@ozlabs.org, paulus@samba.org,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH] powerpc: convert mace to netdev_ops (was: Re: [2.6.30-rc3] powerpc: compilation error of mace module)
Date: Mon, 27 Apr 2009 09:16:33 -0300 [thread overview]
Message-ID: <20090427121633.GA29608@ime.usp.br> (raw)
In-Reply-To: <20090426.230648.254087966.davem@davemloft.net>
Hi, Dave.
On Apr 26 2009, David Miller wrote:
> Or, if you're bored, feel free to convert the mace driver over
> to netdev_ops :-)
Is this anything close to what needs to be done? It's not without
failures, because the function mace_set_timeout receives a pointer to a
struct net_device, but is marked inline and is used by mace_tx_timeout,
which receives an unsigned long (which calls mace_set_timeout).
Perhaps it would be a case of removing the inline hint to the compiler?
I guess that BenH or Paul could comment here better...
Signed-off-by: Rogério Brito <rbrito@ime.usp.br>
---
--- a/drivers/net/mace.c 2008-12-29 15:25:15.000000000 -0200
+++ b/drivers/net/mace.c 2009-04-27 08:54:16.000000000 -0300
@@ -89,6 +89,16 @@ static inline void dbdma_reset(volatile
static inline void mace_clean_rings(struct mace_data *mp);
static void __mace_set_address(struct net_device *dev, void *addr);
+/* Conversion to netdev_ops. */
+static const struct net_device_ops mace_netdev_ops = {
+ .ndo_open = mace_open,
+ .ndo_stop = mace_close,
+ .ndo_start_xmit = mace_xmit_start,
+ .ndo_tx_timeout = mace_set_timeout,
+ .ndo_set_multicast_list = mace_set_multicast,
+ .ndo_set_mac_address = mace_set_address,
+};
+
/*
* If we can't get a skbuff when we need it, we use this area for DMA.
*/
@@ -208,11 +217,7 @@ static int __devinit mace_probe(struct m
}
}
- dev->open = mace_open;
- dev->stop = mace_close;
- dev->hard_start_xmit = mace_xmit_start;
- dev->set_multicast_list = mace_set_multicast;
- dev->set_mac_address = mace_set_address;
+ dev->netdev_ops = &mace_netdev_ops;
/*
* Most of what is below could be moved to mace_open()
--
Rogério Brito : rbrito@{mackenzie,ime.usp}.br : GPG key 1024D/7C2CAEB8
http://www.ime.usp.br/~rbrito : http://meusite.mackenzie.com.br/rbrito
Projects: algorithms.berlios.de : lame.sf.net : vrms.alioth.debian.org
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
next prev parent reply other threads:[~2009-04-27 12:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090426155708.GA23159@ime.usp.br>
2009-04-27 6:06 ` [2.6.30-rc3] powerpc: compilation error of mace module David Miller
2009-04-27 12:16 ` Rogério Brito [this message]
2009-04-27 12:42 ` [PATCH] powerpc: convert mace to netdev_ops David Miller
2009-04-27 14:20 ` Rogério Brito
2009-05-03 11:48 ` Rogério Brito
2009-05-03 21:15 ` David Miller
2009-05-03 21:20 ` David Miller
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=20090427121633.GA29608@ime.usp.br \
--to=rbrito@ime.usp.br \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=netdev@vger.kernel.org \
--cc=paulus@samba.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).