From patchwork Sat Mar 21 05:35:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24855 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 324CEDDDB6 for ; Sat, 21 Mar 2009 16:54:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762174AbZCUFxR (ORCPT ); Sat, 21 Mar 2009 01:53:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754396AbZCUFxM (ORCPT ); Sat, 21 Mar 2009 01:53:12 -0400 Received: from suva.vyatta.com ([76.74.103.44]:36579 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760879AbZCUFsP (ORCPT ); Sat, 21 Mar 2009 01:48:15 -0400 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id n2L5mB0j027098; Fri, 20 Mar 2009 22:48:12 -0700 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id n2L5mBwq027097; Fri, 20 Mar 2009 22:48:11 -0700 Message-Id: <20090321053714.207963951@vyatta.com> References: <20090321053527.316395697@vyatta.com> User-Agent: quilt/0.46-1 Date: Fri, 20 Mar 2009 22:35:49 -0700 From: Stephen Hemminger To: David Miller , dbrownell@users.sourceforge.net Cc: netdev@vger.kernel.org Subject: [PATCH 22/77] usbnet: convert catc device to net_device_ops Content-Disposition: inline; filename=usb-catc.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/catc.c 2009-03-20 12:10:10.851651580 -0700 +++ b/drivers/net/usb/catc.c 2009-03-20 12:10:23.060839265 -0700 @@ -743,6 +743,18 @@ static int catc_stop(struct net_device * return 0; } +static const struct net_device_ops catc_netdev_ops = { + .ndo_open = catc_open, + .ndo_stop = catc_stop, + .ndo_start_xmit = catc_start_xmit, + + .ndo_tx_timeout = catc_tx_timeout, + .ndo_set_multicast_list = catc_set_multicast_list, + .ndo_change_mtu = eth_change_mtu, + .ndo_set_mac_address = eth_mac_addr, + .ndo_validate_addr = eth_validate_addr, +}; + /* * USB probe, disconnect. */ @@ -767,12 +779,8 @@ static int catc_probe(struct usb_interfa catc = netdev_priv(netdev); - netdev->open = catc_open; - netdev->hard_start_xmit = catc_hard_start_xmit; - netdev->stop = catc_stop; - netdev->tx_timeout = catc_tx_timeout; + netdev->netdev_ops = &catc_netdev_ops; netdev->watchdog_timeo = TX_TIMEOUT; - netdev->set_multicast_list = catc_set_multicast_list; SET_ETHTOOL_OPS(netdev, &ops); catc->usbdev = usbdev;