From patchwork Wed Apr 15 22:52:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 26024 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 D53D1DE205 for ; Thu, 16 Apr 2009 08:53:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756579AbZDOWx1 (ORCPT ); Wed, 15 Apr 2009 18:53:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756177AbZDOWxZ (ORCPT ); Wed, 15 Apr 2009 18:53:25 -0400 Received: from mu-out-0910.google.com ([209.85.134.190]:46138 "EHLO mu-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754219AbZDOWxQ (ORCPT ); Wed, 15 Apr 2009 18:53:16 -0400 Received: by mu-out-0910.google.com with SMTP id g7so51288muf.1 for ; Wed, 15 Apr 2009 15:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=ehV0YNrkm9IgpvZYBR7OIhLqYGN/A8ZPy5AWHCvX++M=; b=TD6DYR8Uvu+utEYpeifb6cJGo6gd127uL1oiE5SK9SIhsHiJmrwxu5TlnBEFklKM/Q KIWAEhL9XDBT6c4av/P5PCwiJDzGG2ZnEeAo91V/V1DIH67UydW7+BGU96ESaiW1wSzO Q6HtMUAEv3FvrxUF4dQj16dKaT0U0HZ1cs0wI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=il/jXLXE72HWelZKpXKhgFlvk26Exz8EyLOH2cO7U2g1HCzOQu+3eh4P4HeoZPICd5 BTVJpuHi0wSgvZt3Xuy0wUCMxcF3ZdSHfBz2JK0rJUYbD+AZ2mHRAvL14+hm0uqVX5Wb f3IoiNYg5nO/L5O9yY96mK5VfhLlDb7bOFUmU= Received: by 10.103.222.1 with SMTP id z1mr406968muq.121.1239835993643; Wed, 15 Apr 2009 15:53:13 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-133-38.pppoe.mtu-net.ru [91.76.133.38]) by mx.google.com with ESMTPS id n7sm720179mue.36.2009.04.15.15.53.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 15 Apr 2009 15:53:13 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 09/26] iseries_veth: convert to net_device_ops Date: Thu, 16 Apr 2009 02:52:43 +0400 Message-Id: <1239835980-22502-9-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <1239835980-22502-8-git-send-email-a.beregalov@gmail.com> References: <1239835980-22502-1-git-send-email-a.beregalov@gmail.com> <1239835980-22502-2-git-send-email-a.beregalov@gmail.com> <1239835980-22502-3-git-send-email-a.beregalov@gmail.com> <1239835980-22502-4-git-send-email-a.beregalov@gmail.com> <1239835980-22502-5-git-send-email-a.beregalov@gmail.com> <1239835980-22502-6-git-send-email-a.beregalov@gmail.com> <1239835980-22502-7-git-send-email-a.beregalov@gmail.com> <1239835980-22502-8-git-send-email-a.beregalov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov --- drivers/net/iseries_veth.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index cb793c2..264654d 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c @@ -1021,6 +1021,16 @@ static const struct ethtool_ops ops = { .get_link = veth_get_link, }; +static const struct net_device_ops veth_netdev_ops = { + .ndo_open = veth_open, + .ndo_stop = veth_close, + .ndo_start_xmit = veth_start_xmit, + .ndo_change_mtu = veth_change_mtu, + .ndo_set_multicast_list = veth_set_multicast_list, + .ndo_set_mac_address = NULL, + .ndo_validate_addr = eth_validate_addr, +}; + static struct net_device *veth_probe_one(int vlan, struct vio_dev *vio_dev) { @@ -1067,12 +1077,7 @@ static struct net_device *veth_probe_one(int vlan, memcpy(&port->mac_addr, mac_addr, ETH_ALEN); - dev->open = veth_open; - dev->hard_start_xmit = veth_start_xmit; - dev->stop = veth_close; - dev->change_mtu = veth_change_mtu; - dev->set_mac_address = NULL; - dev->set_multicast_list = veth_set_multicast_list; + dev->netdev = &veth_netdev_ops; SET_ETHTOOL_OPS(dev, &ops); SET_NETDEV_DEV(dev, vdev);