From patchwork Wed Jan 7 00:33:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 16987 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 89AA3DE71C for ; Wed, 7 Jan 2009 11:53:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754783AbZAGAxC (ORCPT ); Tue, 6 Jan 2009 19:53:02 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754697AbZAGAxA (ORCPT ); Tue, 6 Jan 2009 19:53:00 -0500 Received: from suva.vyatta.com ([76.74.103.44]:58975 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754376AbZAGAw7 (ORCPT ); Tue, 6 Jan 2009 19:52:59 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n070qonK029143; Tue, 6 Jan 2009 16:52:51 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n070qojS029142; Tue, 6 Jan 2009 16:52:50 -0800 Message-Id: <20090107003345.513599743@vyatta.com> References: <20090107003316.784424362@vyatta.com> User-Agent: quilt/0.46-1 Date: Tue, 06 Jan 2009 16:33:17 -0800 From: Stephen Hemminger To: David Miller , acme@ghostprotcols.net Cc: netdev@vger.kernel.org Subject: [PATCH 01/42] appletalk: convert aarp to net_device_ops Content-Disposition: inline; filename=atalk-aarp.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger --- 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;