From patchwork Sun Mar 29 15:31:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25289 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 81466DDDB6 for ; Mon, 30 Mar 2009 02:32:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758837AbZC2Pbg (ORCPT ); Sun, 29 Mar 2009 11:31:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758332AbZC2Pbf (ORCPT ); Sun, 29 Mar 2009 11:31:35 -0400 Received: from mail-fx0-f158.google.com ([209.85.220.158]:55116 "EHLO mail-fx0-f158.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758251AbZC2Pbe (ORCPT ); Sun, 29 Mar 2009 11:31:34 -0400 Received: by fxm2 with SMTP id 2so1634220fxm.37 for ; Sun, 29 Mar 2009 08:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=R24hKzUd+xwIoJemIcISsTnhgiiuFB7ejXo5g3p9CxA=; b=ALhbw+olHzmyANxbFynVmfh+EBjYchGptjcZauZnBO7cvrgnaUur1Euul5FYlFXwu1 W3BK4zDXHt8Nk4ZHmcPdcCh2nThPPF4MNaYHiJ9mPi38bhoc+C7wp2kqGSs/t6ruZ+Rv mERwBPoPTLMvzJ4ZzXPMfpYryLWoWOMjwSZRU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=xX1MQAgG98R6MwTHxG1PU9BuSoP1xNrmDE6i4v5To+xftqsbfDwza4zFi8F6U9vUPC dCguVeMun9jOGUCwtz4CbQ0UZrgPYAySPJoq7t3ubZgLw92Mic8YkBYoygmCI0xAUenb frD9gHhrszW0sYsTvt46KZRsFJ6QwHqoMu2VY= Received: by 10.223.116.72 with SMTP id l8mr3175826faq.33.1238340691389; Sun, 29 Mar 2009 08:31:31 -0700 (PDT) Received: from orion (ppp91-76-231-215.pppoe.mtu-net.ru [91.76.231.215]) by mx.google.com with ESMTPS id k29sm1886694fkk.16.2009.03.29.08.31.30 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 29 Mar 2009 08:31:31 -0700 (PDT) Date: Sun, 29 Mar 2009 19:31:28 +0400 From: Alexander Beregalov To: gregkh@suse.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 10/10] Staging: wlan-ng: convert to netdev_ops Message-ID: <20090329153128.GJ11056@orion> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alexander Beregalov Acked-by: David S. Miller --- drivers/staging/wlan-ng/p80211netdev.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index b2a606a..393e4df 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -711,6 +711,20 @@ static int wlan_change_mtu(netdevice_t *dev, int new_mtu) return 0; } +static const struct net_device_ops p80211_netdev_ops = { + .ndo_init = p80211knetdev_init, + .ndo_open = p80211knetdev_open, + .ndo_stop = p80211knetdev_stop, + .ndo_get_stats = p80211knetdev_get_stats, + .ndo_start_xmit = p80211knetdev_hard_start_xmit, + .ndo_set_multicast_list = p80211knetdev_set_multicast_list, + .ndo_do_ioctl = p80211knetdev_do_ioctl, + .ndo_set_mac_address = p80211knetdev_set_mac_address, + .ndo_tx_timeout = p80211knetdev_tx_timeout, + .ndo_change_mtu = wlan_change_mtu, + .ndo_validate_addr = eth_validate_addr, +}; + /*---------------------------------------------------------------- * wlan_setup * @@ -756,11 +770,7 @@ int wlan_setup(wlandevice_t *wlandev) } else { wlandev->netdev = dev; dev->ml_priv = wlandev; - dev->hard_start_xmit = p80211knetdev_hard_start_xmit; - dev->get_stats = p80211knetdev_get_stats; - dev->init = p80211knetdev_init; - dev->open = p80211knetdev_open; - dev->stop = p80211knetdev_stop; + dev->netdev_ops = &p80211_netdev_ops; mutex_init(&wlandev->ioctl_lock); /* block ioctls until fully initialised. Don't forget to call