From patchwork Wed Jan 7 00:33:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 16991 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 B9788DE72D for ; Wed, 7 Jan 2009 11:53:18 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755461AbZAGAxP (ORCPT ); Tue, 6 Jan 2009 19:53:15 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755318AbZAGAxN (ORCPT ); Tue, 6 Jan 2009 19:53:13 -0500 Received: from suva.vyatta.com ([76.74.103.44]:58990 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755424AbZAGAxM (ORCPT ); Tue, 6 Jan 2009 19:53: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 n070r5fl029183; Tue, 6 Jan 2009 16:53:06 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n070r4TA029182; Tue, 6 Jan 2009 16:53:04 -0800 Message-Id: <20090107003346.112191664@vyatta.com> References: <20090107003316.784424362@vyatta.com> User-Agent: quilt/0.46-1 Date: Tue, 06 Jan 2009 16:33:22 -0800 From: Stephen Hemminger To: David Miller , Pekka Enberg Cc: netdev@vger.kernel.org Subject: [PATCH 06/42] ipg: update to net_device_ops Content-Disposition: inline; filename=ipg.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger Acked-by: Pekka Enberg --- a/drivers/net/ipg.c 2009-01-05 16:45:32.729571177 -0800 +++ b/drivers/net/ipg.c 2009-01-05 16:48:07.518569219 -0800 @@ -2210,6 +2210,19 @@ static void __devexit ipg_remove(struct pci_set_drvdata(pdev, NULL); } +static const struct net_device_ops ipg_netdev_ops = { + .ndo_open = ipg_nic_open, + .ndo_stop = ipg_nic_stop, + .ndo_start_xmit = ipg_nic_hard_start_xmit, + .ndo_get_stats = ipg_nic_get_stats, + .ndo_set_multicast_list = ipg_nic_set_multicast_list, + .ndo_do_ioctl = ipg_ioctl, + .ndo_tx_timeout = ipg_tx_timeout, + .ndo_change_mtu = ipg_nic_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + static int __devinit ipg_probe(struct pci_dev *pdev, const struct pci_device_id *id) { @@ -2258,15 +2271,7 @@ static int __devinit ipg_probe(struct pc /* Declare IPG NIC functions for Ethernet device methods. */ - dev->open = &ipg_nic_open; - dev->stop = &ipg_nic_stop; - dev->hard_start_xmit = &ipg_nic_hard_start_xmit; - dev->get_stats = &ipg_nic_get_stats; - dev->set_multicast_list = &ipg_nic_set_multicast_list; - dev->do_ioctl = ipg_ioctl; - dev->tx_timeout = ipg_tx_timeout; - dev->change_mtu = &ipg_nic_change_mtu; - + dev->netdev_ops = &ipg_netdev_ops; SET_NETDEV_DEV(dev, &pdev->dev); SET_ETHTOOL_OPS(dev, &ipg_ethtool_ops);