From patchwork Fri Jan 9 23:01:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 17644 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 7C7DB476B1 for ; Sat, 10 Jan 2009 10:18:54 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756307AbZAIXSd (ORCPT ); Fri, 9 Jan 2009 18:18:33 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754609AbZAIXSY (ORCPT ); Fri, 9 Jan 2009 18:18:24 -0500 Received: from suva.vyatta.com ([76.74.103.44]:42252 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754555AbZAIXSG (ORCPT ); Fri, 9 Jan 2009 18:18:06 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n09NI1Lf017270; Fri, 9 Jan 2009 15:18:01 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n09NI1lY017269; Fri, 9 Jan 2009 15:18:01 -0800 Message-Id: <20090109230139.476591719@linux-foundation.org> User-Agent: quilt/0.47-1 Date: Fri, 09 Jan 2009 15:01:34 -0800 From: Stephen Hemminger To: David Miller , klaus.kudielka@ieee.org Cc: netdev@vger.kernel.org, linux-hams@vger.kernel.org Subject: [patch 37/45] dmascc: convert to network_device_ops References: <20090109230057.575650817@linux-foundation.org> Content-Disposition: inline; filename=dmascc-netdev.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger --- 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 --- a/drivers/net/hamradio/dmascc.c 2009-01-09 12:47:32.000000000 -0800 +++ b/drivers/net/hamradio/dmascc.c 2009-01-09 12:52:12.000000000 -0800 @@ -440,6 +440,13 @@ static void __init dev_setup(struct net_ memcpy(dev->dev_addr, &ax25_defaddr, AX25_ADDR_LEN); } +static const struct net_device_ops scc_netdev_ops = { + .ndo_open = scc_open, + .ndo_stop = scc_close, + .ndo_start_xmit = scc_send_packet, + .ndo_do_ioctl = scc_ioctl, +}; + static int __init setup_adapter(int card_base, int type, int n) { int i, irq, chip; @@ -575,11 +582,7 @@ static int __init setup_adapter(int card sprintf(dev->name, "dmascc%i", 2 * n + i); dev->base_addr = card_base; dev->irq = irq; - dev->open = scc_open; - dev->stop = scc_close; - dev->do_ioctl = scc_ioctl; - dev->hard_start_xmit = scc_send_packet; - dev->get_stats = scc_get_stats; + dev->netdev_ops = &scc_netdev_ops; dev->header_ops = &ax25_header_ops; dev->set_mac_address = scc_set_mac_address; }