From: Stephen Hemminger Date: Thu, 8 Jan 2009 01:21:44 +0000 (-0800) Subject: appletalk: convert aarp to net_device_ops X-Git-Tag: v2.6.29-rc1~45^2~64 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=03b35ccb7c41ccc256631ff33e6887b7be88137b;p=linux-2.6-omap-h63xx.git appletalk: convert aarp to net_device_ops Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller --- diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index b03ff58e930..89f99d3beb6 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c @@ -443,13 +443,14 @@ static void aarp_send_probe_phase1(struct atalk_iface *iface) { 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;