From patchwork Fri Jan 9 23:01:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 17657 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 D6F6A47640 for ; Sat, 10 Jan 2009 10:19:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757366AbZAIXSy (ORCPT ); Fri, 9 Jan 2009 18:18:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757275AbZAIXSw (ORCPT ); Fri, 9 Jan 2009 18:18:52 -0500 Received: from suva.vyatta.com ([76.74.103.44]:42286 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754860AbZAIXSM (ORCPT ); Fri, 9 Jan 2009 18:18:12 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n09NI5r8017359; Fri, 9 Jan 2009 15:18:05 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n09NI5Wq017358; Fri, 9 Jan 2009 15:18:05 -0800 Message-Id: <20090109230140.086882481@linux-foundation.org> User-Agent: quilt/0.47-1 Date: Fri, 09 Jan 2009 15:01:42 -0800 From: Stephen Hemminger To: David Miller , klaus.kudielka@ieee.org Cc: netdev@vger.kernel.org, linux-hams@vger.kernel.org Subject: [patch 45/45] dmascc: convert to internal net_device_ops References: <20090109230057.575650817@linux-foundation.org> Content-Disposition: inline; filename=82596-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/82596.c 2009-01-08 08:30:09.000000000 -0800 +++ b/drivers/net/82596.c 2009-01-09 14:05:18.000000000 -0800 @@ -1122,6 +1122,17 @@ static void print_eth(unsigned char *add static int io = 0x300; static int irq = 10; +static const struct net_device_ops i596_netdev_ops = { + .ndo_open = i596_open, + .ndo_stop = i596_close, + .ndo_start_xmit = i596_start_xmit, + .ndo_set_multicast_list = set_multicast_list, + .ndo_tx_timeout = i596_tx_timeout, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + struct net_device * __init i82596_probe(int unit) { struct net_device *dev; @@ -1232,11 +1243,7 @@ found: DEB(DEB_PROBE,printk(KERN_INFO "%s", version)); /* The 82596-specific entries in the device structure. */ - dev->open = i596_open; - dev->stop = i596_close; - dev->hard_start_xmit = i596_start_xmit; - dev->set_multicast_list = set_multicast_list; - dev->tx_timeout = i596_tx_timeout; + dev->netdev_ops = &i596_netdev_ops; dev->watchdog_timeo = TX_TIMEOUT; dev->ml_priv = (void *)(dev->mem_start);