From patchwork Sat Mar 21 05:35:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24845 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 21514DDDB6 for ; Sat, 21 Mar 2009 16:54:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762132AbZCUFwk (ORCPT ); Sat, 21 Mar 2009 01:52:40 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762093AbZCUFwh (ORCPT ); Sat, 21 Mar 2009 01:52:37 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36581 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760896AbZCUFsQ (ORCPT ); Sat, 21 Mar 2009 01:48:16 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n2L5mCNA027110; Fri, 20 Mar 2009 22:48:12 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2L5mCBS027109; Fri, 20 Mar 2009 22:48:12 -0700 Message-Id: <20090321053714.437968008@vyatta.com> References: <20090321053527.316395697@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 20 Mar 2009 22:35:52 -0700 From: Stephen Hemminger To: David Miller , dbrownell@users.sourceforge.net Cc: netdev@vger.kernel.org Subject: [PATCH 25/77] usbnet: convert hso driver to net_device_ops Content-Disposition: inline; filename=usb-hso.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Stephen Hemminger --- a/drivers/net/usb/hso.c 2009-03-09 08:23:41.851308905 -0700 +++ b/drivers/net/usb/hso.c 2009-03-20 08:35:11.089026883 -0700 @@ -2428,6 +2428,13 @@ static void hso_free_net_device(struct h kfree(hso_dev); } +static const struct net_device_ops hso_netdev_ops = { + .ndo_open = hso_net_open, + .ndo_stop = hso_net_close, + .ndo_start_xmit = hso_net_start_xmit, + .ndo_tx_timeout = hso_net_tx_timeout, +}; + /* initialize the network interface */ static void hso_net_init(struct net_device *net) { @@ -2436,10 +2443,7 @@ static void hso_net_init(struct net_devi D1("sizeof hso_net is %d", (int)sizeof(*hso_net)); /* fill in the other fields */ - net->open = hso_net_open; - net->stop = hso_net_close; - net->hard_start_xmit = hso_net_start_xmit; - net->tx_timeout = hso_net_tx_timeout; + net->netdev_ops = &hso_netdev_ops; net->watchdog_timeo = HSO_NET_TX_TIMEOUT; net->flags = IFF_POINTOPOINT | IFF_NOARP | IFF_MULTICAST; net->type = ARPHRD_NONE;