From patchwork Fri Jan 9 09:01:59 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: frank.blaschka@de.ibm.com X-Patchwork-Id: 17482 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 A38904753B for ; Fri, 9 Jan 2009 20:02:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753933AbZAIJCi (ORCPT ); Fri, 9 Jan 2009 04:02:38 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753892AbZAIJCg (ORCPT ); Fri, 9 Jan 2009 04:02:36 -0500 Received: from mtagate8.de.ibm.com ([195.212.29.157]:57049 "EHLO mtagate8.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753787AbZAIJCY (ORCPT ); Fri, 9 Jan 2009 04:02:24 -0500 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate8.de.ibm.com (8.13.8/8.13.8) with ESMTP id n0992NCO595744; Fri, 9 Jan 2009 09:02:23 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id n0992Ntr3891440; Fri, 9 Jan 2009 10:02:23 +0100 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n0992MQu021406; Fri, 9 Jan 2009 10:02:22 +0100 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n0992M8g021395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Jan 2009 10:02:22 +0100 Received: from tuxmaker.boeblingen.de.ibm.com (localhost.localdomain [127.0.0.1]) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8) with ESMTP id n0992MJd005980; Fri, 9 Jan 2009 10:02:22 +0100 Received: (from blaschka@localhost) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8/Submit) id n0992LDP005979; Fri, 9 Jan 2009 10:02:21 +0100 X-Authentication-Warning: tuxmaker.boeblingen.de.ibm.com: blaschka set sender to frank.blaschka@de.ibm.com using -f Message-Id: <20090109090221.873883000@de.ibm.com> References: <20090109090156.422658000@de.ibm.com> User-Agent: quilt/0.46-1 Date: Fri, 09 Jan 2009 10:01:59 +0100 From: frank.blaschka@de.ibm.com To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-s390@vger.kernel.org, ursula.braun@de.ibm.com Subject: [patch 3/4] netiucv: convert to net_device_ops Content-Disposition: inline; filename=netiucv_devops.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Frank Blaschka netiucv convert to net_device_ops. Signed-off-by: Frank Blaschka --- drivers/s390/net/netiucv.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) Index: git_linus/drivers/s390/net/netiucv.c =================================================================== --- git_linus.orig/drivers/s390/net/netiucv.c +++ git_linus/drivers/s390/net/netiucv.c @@ -1876,20 +1876,24 @@ static void netiucv_free_netdevice(struc /** * Initialize a net device. (Called from kernel in alloc_netdev()) */ +static struct net_device_ops netiucv_netdev_ops = { + .ndo_open = netiucv_open, + .ndo_stop = netiucv_close, + .ndo_get_stats = netiucv_stats, + .ndo_start_xmit = netiucv_tx, + .ndo_change_mtu = netiucv_change_mtu, +}; + static void netiucv_setup_netdevice(struct net_device *dev) { dev->mtu = NETIUCV_MTU_DEFAULT; - dev->hard_start_xmit = netiucv_tx; - dev->open = netiucv_open; - dev->stop = netiucv_close; - dev->get_stats = netiucv_stats; - dev->change_mtu = netiucv_change_mtu; dev->destructor = netiucv_free_netdevice; dev->hard_header_len = NETIUCV_HDRLEN; dev->addr_len = 0; dev->type = ARPHRD_SLIP; dev->tx_queue_len = NETIUCV_QUEUELEN_DEFAULT; dev->flags = IFF_POINTOPOINT | IFF_NOARP; + dev->netdev_ops = &netiucv_netdev_ops; } /**