From: Sascha Hauer <s.hauer@pengutronix.de>
To: netdev@vger.kernel.org
Cc: Greg Ungerer <gerg@snapgear.com>, Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH 10/12] fec: switch to net_device_ops
Date: Wed, 15 Apr 2009 13:32:23 +0200 [thread overview]
Message-ID: <1239795145-27558-11-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1239795145-27558-10-git-send-email-s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/net/fec.c | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index d96aba9..f4afbe9 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -210,17 +210,13 @@ struct fec_enet_private {
int full_duplex;
};
-static int fec_enet_open(struct net_device *dev);
-static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
static void fec_enet_mii(struct net_device *dev);
static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);
static void fec_enet_tx(struct net_device *dev);
static void fec_enet_rx(struct net_device *dev);
static int fec_enet_close(struct net_device *dev);
-static void set_multicast_list(struct net_device *dev);
static void fec_restart(struct net_device *dev, int duplex);
static void fec_stop(struct net_device *dev);
-static void fec_set_mac_address(struct net_device *dev);
/* MII processing. We keep this as simple as possible. Requests are
@@ -1411,7 +1407,6 @@ fec_enet_open(struct net_device *dev)
/* I should reset the ring buffers here, but I don't yet know
* a simple way to do that.
*/
- fec_set_mac_address(dev);
fep->sequence_done = 0;
fep->link = 0;
@@ -1544,19 +1539,35 @@ static void set_multicast_list(struct net_device *dev)
}
/* Set a MAC change in hardware. */
-static void
-fec_set_mac_address(struct net_device *dev)
+static int
+fec_set_mac_address(struct net_device *dev, void *p)
{
struct fec_enet_private *fep = netdev_priv(dev);
+ struct sockaddr *addr = p;
+
+ if (!is_valid_ether_addr(addr->sa_data))
+ return -EADDRNOTAVAIL;
+
+ memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
- /* Set station address. */
writel(dev->dev_addr[3] | (dev->dev_addr[2] << 8) |
(dev->dev_addr[1] << 16) | (dev->dev_addr[0] << 24),
fep->hwp + FEC_ADDR_LOW);
writel((dev->dev_addr[5] << 16) | (dev->dev_addr[4] << 24),
fep + FEC_ADDR_HIGH);
+ return 0;
}
+static const struct net_device_ops fec_netdev_ops = {
+ .ndo_open = fec_enet_open,
+ .ndo_stop = fec_enet_close,
+ .ndo_start_xmit = fec_enet_start_xmit,
+ .ndo_set_multicast_list = set_multicast_list,
+ .ndo_validate_addr = eth_validate_addr,
+ .ndo_tx_timeout = fec_timeout,
+ .ndo_set_mac_address = fec_set_mac_address,
+};
+
/*
* XXX: We need to clean up on failure exits here.
*
@@ -1652,12 +1663,8 @@ int __init fec_enet_init(struct net_device *dev, int index)
fec_request_mii_intr(dev);
#endif
/* The FEC Ethernet specific entries in the device structure */
- dev->open = fec_enet_open;
- dev->hard_start_xmit = fec_enet_start_xmit;
- dev->tx_timeout = fec_timeout;
dev->watchdog_timeo = TX_TIMEOUT;
- dev->stop = fec_enet_close;
- dev->set_multicast_list = set_multicast_list;
+ dev->netdev_ops = &fec_netdev_ops;
for (i=0; i<NMII-1; i++)
mii_cmds[i].mii_next = &mii_cmds[i+1];
@@ -1696,9 +1703,6 @@ fec_restart(struct net_device *dev, int duplex)
/* Clear any outstanding interrupt. */
writel(0xffc00000, fep->hwp + FEC_IEVENT);
- /* Set station address. */
- fec_set_mac_address(dev);
-
/* Reset all multicast. */
writel(0, fep->hwp + FEC_GRP_HASH_TABLE_HIGH);
writel(0, fep->hwp + FEC_GRP_HASH_TABLE_LOW);
--
1.6.2.1
next prev parent reply other threads:[~2009-04-15 11:36 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-15 11:32 [PATCH] FEC driver: patches for -next Sascha Hauer
2009-04-15 11:32 ` [PATCH 01/12] fec: remove unused ifdef Sascha Hauer
2009-04-15 11:32 ` [PATCH 02/12] fec: switch to writel/readl Sascha Hauer
2009-04-15 11:32 ` [PATCH 03/12] fec: do not typedef struct types Sascha Hauer
2009-04-15 11:32 ` [PATCH 04/12] fec: remove unnecessary cast Sascha Hauer
2009-04-15 11:32 ` [PATCH 05/12] fec: Codingstyle cleanups Sascha Hauer
2009-04-15 11:32 ` [PATCH 06/12] fec: refactor set_multicast_list() to make it more readable Sascha Hauer
2009-04-15 11:32 ` [PATCH 07/12] fec: refactor init function Sascha Hauer
2009-04-15 11:32 ` [PATCH 08/12] fec: align receive packets Sascha Hauer
2009-04-15 11:32 ` [PATCH 09/12] fec: remove debugging printks Sascha Hauer
2009-04-15 11:32 ` Sascha Hauer [this message]
2009-04-15 11:32 ` [PATCH 11/12] FEC Buffer rework Sascha Hauer
2009-04-15 11:32 ` [PATCH 12/12] fec: call fec_restart() in fec_open() Sascha Hauer
2009-04-16 9:38 ` David Miller
2009-04-16 9:38 ` [PATCH 11/12] FEC Buffer rework David Miller
2009-04-17 10:07 ` Greg Ungerer
2009-04-17 10:12 ` Sascha Hauer
2009-04-16 9:37 ` [PATCH 10/12] fec: switch to net_device_ops David Miller
2009-04-16 9:37 ` [PATCH 09/12] fec: remove debugging printks David Miller
2009-04-16 9:37 ` [PATCH 08/12] fec: align receive packets David Miller
2009-04-16 9:37 ` [PATCH 07/12] fec: refactor init function David Miller
2009-04-16 9:37 ` [PATCH 06/12] fec: refactor set_multicast_list() to make it more readable David Miller
2009-04-16 9:36 ` [PATCH 05/12] fec: Codingstyle cleanups David Miller
2009-04-16 9:36 ` [PATCH 04/12] fec: remove unnecessary cast David Miller
2009-04-16 9:36 ` [PATCH 03/12] fec: do not typedef struct types David Miller
2009-04-15 13:11 ` [PATCH 02/12] fec: switch to writel/readl Sascha Hauer
2009-04-16 9:36 ` David Miller
2009-04-15 12:12 ` [PATCH] FEC driver: patches for -next Greg Ungerer
2009-04-15 12:55 ` Sascha Hauer
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=1239795145-27558-11-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=gerg@snapgear.com \
--cc=netdev@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 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).