From patchwork Fri Mar 27 01:11: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: 25188 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 62532DDDA0 for ; Fri, 27 Mar 2009 12:22:45 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753434AbZC0BWl (ORCPT ); Thu, 26 Mar 2009 21:22:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753089AbZC0BWl (ORCPT ); Thu, 26 Mar 2009 21:22:41 -0400 Received: from suva.vyatta.com ([76.74.103.44]:39797 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbZC0BWk (ORCPT ); Thu, 26 Mar 2009 21:22:40 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n2R1M3L8016733; Thu, 26 Mar 2009 18:22:03 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2R1LIDM016671; Thu, 26 Mar 2009 18:21:18 -0700 Message-Id: <20090327011255.168951778@linux-foundation.org> User-Agent: quilt/0.47-1 Date: Thu, 26 Mar 2009 18:11:17 -0700 From: Stephen Hemminger To: David Miller , jdike@addtoit.com Cc: netdev@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Subject: [patch 03/30] uml: convert network device to netdevice ops References: <20090327011114.169107105@linux-foundation.org> Content-Disposition: inline; filename=uml-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/arch/um/drivers/net_kern.c 2009-03-22 21:11:51.000000000 -0700 +++ b/arch/um/drivers/net_kern.c 2009-03-22 21:17:17.920674346 -0700 @@ -371,6 +371,18 @@ static void net_device_release(struct de free_netdev(netdev); } +static const struct net_device_ops uml_netdev_ops = { + .ndo_open = uml_net_open, + .ndo_stop = uml_net_close, + .ndo_start_xmit = uml_net_start_xmit, + .ndo_set_multicast_list = uml_net_set_multicast_list, + .ndo_tx_timeout = uml_net_tx_timeout, + .ndo_set_mac_address = uml_net_set_mac, + .ndo_change_mtu = uml_net_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + /* * Ensures that platform_driver_register is called only once by * eth_configure. Will be set in an initcall. @@ -467,13 +479,7 @@ static void eth_configure(int n, void *i set_ether_mac(dev, device->mac); dev->mtu = transport->user->mtu; - dev->open = uml_net_open; - dev->hard_start_xmit = uml_net_start_xmit; - dev->stop = uml_net_close; - dev->set_multicast_list = uml_net_set_multicast_list; - dev->tx_timeout = uml_net_tx_timeout; - dev->set_mac_address = uml_net_set_mac; - dev->change_mtu = uml_net_change_mtu; + dev->netdev_ops = ¨_netdev_ops; dev->ethtool_ops = ¨_net_ethtool_ops; dev->watchdog_timeo = (HZ >> 1); dev->irq = UM_ETH_IRQ;