Commit d32da050 authored Apr 16, 2009 by Alexander Beregalov Committed by David S. Miller Apr 17, 2009

wan/pc300_drv: convert to net_device_ops



On Fri, Apr 17, 2009 at 05:23:02AM +0400, Alexander Beregalov wrote:
>
> Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
> ---
>  drivers/net/wan/pc300_drv.c |   22 ++++++++++++++--------
>  1 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
> index c23fde0..df10a4c 100644
> --- a/drivers/net/wan/pc300_drv.c
> +++ b/drivers/net/wan/pc300_drv.c
> @@ -225,6 +225,7 @@ static char rcsid[] =
>  #include <linux/skbuff.h>
>  #include <linux/if_arp.h>
>  #include <linux/netdevice.h>
> +#include <linux/etherdevice.h>
>  #include <linux/spinlock.h>
>  #include <linux/if.h>
>  #include <net/arp.h>
> @@ -3246,6 +3247,18 @@ static inline void show_version(void)
>  		rcsvers, rcsdate, __DATE__, __TIME__);
>  }				/* show_version */
>
> +static const struct net_device_ops cpc_netdev_ops = {
> +	.ndo_init		= NULL,
> +	.ndo_open		= cpc_open,
> +	.ndo_stop		= cpc_close,
> +	.ndo_tx_timeout		= cpc_tx_timeout,
> +	.ndo_set_multicast_list	= NULL,

In this case ndo_init and ndo_set_multicast_list
are not needed.

>From 1507a5a797a5f0005696a9bf10e390caca9c3800 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Fri, 17 Apr 2009 05:45:48 +0400
Subject: [PATCH] wan/pc300_drv: convert to net_device_ops

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f6a26293

drivers/net/wan/pc300_drv.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -225,6 +225,7 @@ static char rcsid[] =
		#include <linux/skbuff.h>
		#include <linux/if_arp.h>
		#include <linux/netdevice.h>
		#include <linux/etherdevice.h>
		#include <linux/spinlock.h>
		#include <linux/if.h>
		#include <net/arp.h>
		@@ -3246,6 +3247,16 @@ static inline void show_version(void)
		rcsvers, rcsdate, __DATE__, __TIME__);
		} /* show_version */

		static const struct net_device_ops cpc_netdev_ops = {
		.ndo_open = cpc_open,
		.ndo_stop = cpc_close,
		.ndo_tx_timeout = cpc_tx_timeout,
		.ndo_set_mac_address = NULL,
		.ndo_change_mtu = cpc_change_mtu,
		.ndo_do_ioctl = cpc_ioctl,
		.ndo_validate_addr = eth_validate_addr,
		};

		static void cpc_init_card(pc300_t * card)
		{
		int i, devcount = 0;
		@@ -3357,18 +3368,11 @@ static void cpc_init_card(pc300_t * card)
		dev->mem_start = card->hw.ramphys;
		dev->mem_end = card->hw.ramphys + card->hw.ramsize - 1;
		dev->irq = card->hw.irq;
		dev->init = NULL;
		dev->tx_queue_len = PC300_TX_QUEUE_LEN;
		dev->mtu = PC300_DEF_MTU;

		dev->open = cpc_open;
		dev->stop = cpc_close;
		dev->tx_timeout = cpc_tx_timeout;
		dev->netdev_ops = &cpc_netdev_ops;
		dev->watchdog_timeo = PC300_TX_TIMEOUT;
		dev->set_multicast_list = NULL;
		dev->set_mac_address = NULL;
		dev->change_mtu = cpc_change_mtu;
		dev->do_ioctl = cpc_ioctl;

		if (register_hdlc_device(dev) == 0) {
		printk("%s: Cyclades-PC300/", dev->name);

Admin message