Patchwork [01/42] appletalk: convert aarp to net_device_ops

login
register
mail settings
Submitter stephen hemminger
Date Jan. 7, 2009, 12:33 a.m.
Message ID <20090107003345.513599743@vyatta.com>
Download mbox | patch
Permalink /patch/16987/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - Jan. 7, 2009, 12:33 a.m.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
David Miller - Jan. 8, 2009, 1:21 a.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Tue, 06 Jan 2009 16:33:17 -0800

> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Joe Perches - Jan. 8, 2009, 3:09 a.m.
On Wed, 2009-01-07 at 17:21 -0800, David Miller wrote:
> From: Stephen Hemminger <shemminger@vyatta.com>
> > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> Applied.

Was it necessary to preface ndo_ to all the netdev_ops members?
It's a bit hungarian compared to most all kernel sources.

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Jan. 8, 2009, 4:39 a.m.
From: Joe Perches <joe@perches.com>
Date: Wed, 07 Jan 2009 19:09:32 -0800

> On Wed, 2009-01-07 at 17:21 -0800, David Miller wrote:
> > From: Stephen Hemminger <shemminger@vyatta.com>
> > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
> > Applied.
> 
> Was it necessary to preface ndo_ to all the netdev_ops members?
> It's a bit hungarian compared to most all kernel sources.

Yes, so that it is easily grep'able, I explicitly asked
Stephen Hemminger to make it this way.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/net/appletalk/aarp.c	2009-01-03 20:42:09.251514959 -0800
+++ b/net/appletalk/aarp.c	2009-01-03 20:44:24.182763615 -0800
@@ -443,13 +443,14 @@  static void aarp_send_probe_phase1(struc
 {
 	struct ifreq atreq;
 	struct sockaddr_at *sa = (struct sockaddr_at *)&atreq.ifr_addr;
+	const struct net_device_ops *ops = iface->dev->netdev_ops;
 
 	sa->sat_addr.s_node = iface->address.s_node;
 	sa->sat_addr.s_net = ntohs(iface->address.s_net);
 
 	/* We pass the Net:Node to the drivers/cards by a Device ioctl. */
-	if (!(iface->dev->do_ioctl(iface->dev, &atreq, SIOCSIFADDR))) {
-		(void)iface->dev->do_ioctl(iface->dev, &atreq, SIOCGIFADDR);
+	if (!(ops->ndo_do_ioctl(iface->dev, &atreq, SIOCSIFADDR))) {
+		ops->ndo_do_ioctl(iface->dev, &atreq, SIOCGIFADDR);
 		if (iface->address.s_net != htons(sa->sat_addr.s_net) ||
 		    iface->address.s_node != sa->sat_addr.s_node)
 			iface->status |= ATIF_PROBE_FAIL;