From patchwork Fri Jan 9 09:01:58 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: 17480 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 2C073DE269 for ; Fri, 9 Jan 2009 20:02:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753858AbZAIJCc (ORCPT ); Fri, 9 Jan 2009 04:02:32 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753844AbZAIJCb (ORCPT ); Fri, 9 Jan 2009 04:02:31 -0500 Received: from mtagate1.de.ibm.com ([195.212.17.161]:35243 "EHLO mtagate1.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753655AbZAIJCX (ORCPT ); Fri, 9 Jan 2009 04:02:23 -0500 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate1.de.ibm.com (8.13.1/8.13.1) with ESMTP id n0992MU3016571; Fri, 9 Jan 2009 09:02:22 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 n0992Mtv3248314; Fri, 9 Jan 2009 10:02:22 +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 n0992LY2021378; 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 n0992LWQ021375 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 9 Jan 2009 10:02:21 +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 n0992LFL005952; Fri, 9 Jan 2009 10:02:21 +0100 Received: (from blaschka@localhost) by tuxmaker.boeblingen.de.ibm.com (8.13.8/8.13.8/Submit) id n0992LwK005951; 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.211457000@de.ibm.com> References: <20090109090156.422658000@de.ibm.com> User-Agent: quilt/0.46-1 Date: Fri, 09 Jan 2009 10:01:58 +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 2/4] ctcm: convert to net_device_ops Content-Disposition: inline; filename=ctcm_devops.diff Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Frank Blaschka ctcm convert to net_device_ops. Signed-off-by: Frank Blaschka --- drivers/s390/net/ctcm_main.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) Index: git_linus/drivers/s390/net/ctcm_main.c =================================================================== --- git_linus.orig/drivers/s390/net/ctcm_main.c +++ git_linus/drivers/s390/net/ctcm_main.c @@ -1099,15 +1099,19 @@ static void ctcm_free_netdevice(struct n struct mpc_group *ctcmpc_init_mpc_group(struct ctcm_priv *priv); +static struct net_device_ops ctcm_netdev_ops = { + .ndo_open = ctcm_open, + .ndo_stop = ctcm_close, + .ndo_get_stats = ctcm_stats, + .ndo_change_mtu = ctcm_change_mtu, +}; + void static ctcm_dev_setup(struct net_device *dev) { - dev->open = ctcm_open; - dev->stop = ctcm_close; - dev->get_stats = ctcm_stats; - dev->change_mtu = ctcm_change_mtu; dev->type = ARPHRD_SLIP; dev->tx_queue_len = 100; dev->flags = IFF_POINTOPOINT | IFF_NOARP; + dev->netdev_ops = &ctcm_netdev_ops; } /* @@ -1157,12 +1161,12 @@ static struct net_device *ctcm_init_netd dev->mtu = MPC_BUFSIZE_DEFAULT - TH_HEADER_LENGTH - PDU_HEADER_LENGTH; - dev->hard_start_xmit = ctcmpc_tx; + ctcm_netdev_ops.ndo_start_xmit = ctcmpc_tx; dev->hard_header_len = TH_HEADER_LENGTH + PDU_HEADER_LENGTH; priv->buffer_size = MPC_BUFSIZE_DEFAULT; } else { dev->mtu = CTCM_BUFSIZE_DEFAULT - LL_HEADER_LENGTH - 2; - dev->hard_start_xmit = ctcm_tx; + ctcm_netdev_ops.ndo_start_xmit = ctcm_tx; dev->hard_header_len = LL_HEADER_LENGTH + 2; }