From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.123] helo=mx.sourceforge.net) by 235xhf1.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1Ln0mN-0003mT-9c for user-mode-linux-devel@lists.sourceforge.net; Fri, 27 Mar 2009 01:22:39 +0000 Received: from suva.vyatta.com ([76.74.103.44]) by 3b2kzd1.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1Ln0mJ-0005YX-SM for user-mode-linux-devel@lists.sourceforge.net; Fri, 27 Mar 2009 01:22:39 +0000 Message-Id: <20090327011255.168951778@linux-foundation.org> Date: Thu, 26 Mar 2009 18:11:17 -0700 From: Stephen Hemminger References: <20090327011114.169107105@linux-foundation.org> Content-Disposition: inline; filename=uml-netdev.patch Subject: [uml-devel] [patch 03/30] uml: convert network device to netdevice ops List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: David Miller , jdike@addtoit.com Cc: netdev@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net Signed-off-by: Stephen Hemminger --- 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; ------------------------------------------------------------------------------ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: [patch 03/30] uml: convert network device to netdevice ops Date: Thu, 26 Mar 2009 18:11:17 -0700 Message-ID: <20090327011255.168951778@linux-foundation.org> References: <20090327011114.169107105@linux-foundation.org> Cc: netdev@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net To: David Miller , jdike@addtoit.com Return-path: 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 Content-Disposition: inline; filename=uml-netdev.patch Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Stephen Hemminger --- 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;