Home » Mailing list archives » linux-netdev » 2009 » March » 21

[PATCH 44/77] axnet: convert ot net_device_ops

Previous thread: [PATCH 46/77] x25_asy: convert to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:36 pm. (2 messages)

Next thread: [PATCH 53/77] sbni: convert to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:36 pm. (2 messages)
[view original message]
From: Stephen Hemminger
Subject: [PATCH 44/77] axnet: convert ot net_device_ops
Date: Friday, March 20, 2009 - 10:36 pm

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>


--- a/drivers/net/pcmcia/axnet_cs.c	2009-03-20 16:06:45.275902397 -0700
+++ b/drivers/net/pcmcia/axnet_cs.c	2009-03-20 16:27:39.823027704 -0700
@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/ethtool.h>
 #include <linux/netdevice.h>
+#include <linux/etherdevice.h>
 #include <linux/crc32.h>
 #include "../8390.h"
 
@@ -91,6 +92,10 @@ static void axnet_release(struct pcmcia_
 static int axnet_open(struct net_device *dev);
 static int axnet_close(struct net_device *dev);
 static int axnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+static int axnet_start_xmit(struct sk_buff *skb, struct net_device *dev);
+static struct net_device_stats *get_stats(struct net_device *dev);
+static void set_multicast_list(struct net_device *dev);
+static void axnet_tx_timeout(struct net_device *dev);
 static const struct ethtool_ops netdev_ethtool_ops;
 static irqreturn_t ei_irq_wrapper(int irq, void *dev_id);
 static void ei_watchdog(u_long arg);
@@ -108,7 +113,6 @@ static void block_output(struct net_devi
 
 static void axnet_detach(struct pcmcia_device *p_dev);
 
-static void axdev_setup(struct net_device *dev);
 static void AX88190_init(struct net_device *dev, int startp);
 static int ax_open(struct net_device *dev);
 static int ax_close(struct net_device *dev);
@@ -134,6 +138,19 @@ static inline axnet_dev_t *PRIV(struct n
 	return p;
 }
 
+static const struct net_device_ops axnet_netdev_ops = {
+	.ndo_open 		= axnet_open,
+	.ndo_stop		= axnet_close,
+	.ndo_do_ioctl		= axnet_ioctl,
+	.ndo_start_xmit		= axnet_start_xmit,
+	.ndo_tx_timeout		= axnet_tx_timeout,
+	.ndo_get_stats		= get_stats,
+	.ndo_set_multicast_list = set_multicast_list,
+	.ndo_change_mtu		= eth_change_mtu,
+	.ndo_set_mac_address 	= eth_mac_addr,
+	.ndo_validate_addr	= eth_validate_addr,
+};
+
 /*======================================================================
 
     axnet_attach() creates an "instance" of the driver, ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH 44/77] axnet: convert ot net_device_ops
Date: Saturday, March 21, 2009 - 10:42 pm

From: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--


[ message continues ]
Previous thread: [PATCH 46/77] x25_asy: convert to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:36 pm. (2 messages)

Next thread: [PATCH 53/77] sbni: convert to net_device_ops by Stephen Hemminger on Friday, March 20, 2009 - 10:36 pm. (2 messages)