netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Hemminger <shemminger@vyatta.com>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: [PATCH 28/33] enic: convert to net_device_ops
Date: Mon, 17 Nov 2008 15:42:35 -0800	[thread overview]
Message-ID: <20081117234357.173505630@vyatta.com> (raw)
In-Reply-To: 20081117234207.854110282@vyatta.com

[-- Attachment #1: enic-netdev_ops.patch --]
[-- Type: text/plain, Size: 1785 bytes --]

Convert this driver to network device ops. Compile tested only.

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

--- a/drivers/net/enic/enic_main.c	2008-11-17 13:23:10.000000000 -0800
+++ b/drivers/net/enic/enic_main.c	2008-11-17 13:26:25.000000000 -0800
@@ -1590,6 +1590,22 @@ static void enic_iounmap(struct enic *en
 		iounmap(enic->bar0.vaddr);
 }
 
+static const struct net_device_ops enic_netdev_ops = {
+	.open = enic_open,
+	.stop = enic_stop,
+	.get_stats = enic_get_stats,
+	.validate_addr = eth_validate_addr,
+	.set_multicast_list = enic_set_multicast_list,
+	.change_mtu = enic_change_mtu,
+	.vlan_rx_register = enic_vlan_rx_register,
+	.vlan_rx_add_vid = enic_vlan_rx_add_vid,
+	.vlan_rx_kill_vid = enic_vlan_rx_kill_vid,
+	.tx_timeout = enic_tx_timeout,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+	.poll_controller = enic_poll_controller,
+#endif
+};
+
 static int __devinit enic_probe(struct pci_dev *pdev,
 	const struct pci_device_id *ent)
 {
@@ -1813,21 +1829,10 @@ static int __devinit enic_probe(struct p
 		goto err_out_free_vnic_resources;
 	}
 
-	netdev->open = enic_open;
-	netdev->stop = enic_stop;
+	netdev->netdev_ops = &enic_netdev_ops;
 	netdev->hard_start_xmit = enic_hard_start_xmit;
-	netdev->get_stats = enic_get_stats;
-	netdev->set_multicast_list = enic_set_multicast_list;
-	netdev->change_mtu = enic_change_mtu;
-	netdev->vlan_rx_register = enic_vlan_rx_register;
-	netdev->vlan_rx_add_vid = enic_vlan_rx_add_vid;
-	netdev->vlan_rx_kill_vid = enic_vlan_rx_kill_vid;
-	netdev->tx_timeout = enic_tx_timeout;
 	netdev->watchdog_timeo = 2 * HZ;
 	netdev->ethtool_ops = &enic_ethtool_ops;
-#ifdef CONFIG_NET_POLL_CONTROLLER
-	netdev->poll_controller = enic_poll_controller;
-#endif
 
 	switch (vnic_dev_get_intr_mode(enic->vdev)) {
 	default:

-- 


  parent reply	other threads:[~2008-11-18  0:00 UTC|newest]

Thread overview: 93+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-17 23:42 [PATCH 00/33] Network Devices Ops (v0.3) Stephen Hemminger
2008-11-17 23:42 ` [PATCH 01/33] netdev: network device operations infrastructure Stephen Hemminger
2008-11-20  5:26   ` David Miller
2008-11-20  5:27     ` David Miller
2008-11-17 23:42 ` [PATCH 02/33] netdev: introduce dev_get_stats() Stephen Hemminger
2008-11-20  5:40   ` David Miller
2008-11-20  9:17     ` Eric Dumazet
2008-11-20 12:27       ` David Miller
2008-11-17 23:42 ` [PATCH 03/33] netdev: expose ethernet address primitives Stephen Hemminger
2008-11-20  5:45   ` David Miller
2008-11-20  6:40     ` David Miller
2008-11-17 23:42 ` [PATCH 04/33] netdev: convert loopback to net_device_ops Stephen Hemminger
2008-11-20  5:46   ` David Miller
2008-11-17 23:42 ` [PATCH 05/33] ifb: convert " Stephen Hemminger
2008-11-20  5:47   ` David Miller
2008-11-17 23:42 ` [PATCH 06/33] dummy: " Stephen Hemminger
2008-11-20  5:48   ` David Miller
2008-11-17 23:42 ` [PATCH 07/33] bridge: " Stephen Hemminger
2008-11-20  5:49   ` David Miller
2008-11-17 23:42 ` [PATCH 08/33] veth: " Stephen Hemminger
2008-11-20  5:50   ` David Miller
2008-11-17 23:42 ` [PATCH 09/33] macvlan: " Stephen Hemminger
2008-11-20  5:51   ` David Miller
2008-11-17 23:42 ` [PATCH 10/33] ip: convert to net_device_ops for ioctl Stephen Hemminger
2008-11-20  5:52   ` David Miller
2008-11-17 23:42 ` [PATCH 11/33] vlan: convert to net_device_ops Stephen Hemminger
2008-11-20  5:54   ` David Miller
2008-11-17 23:42 ` [PATCH 12/33] bonding: " Stephen Hemminger
2008-11-20  5:56   ` David Miller
2008-11-17 23:42 ` [PATCH 13/33] e1000e: " Stephen Hemminger
2008-11-20  5:58   ` David Miller
2008-11-17 23:42 ` [PATCH 14/33] sky2: " Stephen Hemminger
2008-11-18  1:37   ` Stephen Hemminger
2008-11-20  6:00     ` David Miller
2008-11-17 23:42 ` [PATCH 15/33] skge: " Stephen Hemminger
2008-11-20  6:01   ` David Miller
2008-11-17 23:42 ` [PATCH 16/33] r8169: " Stephen Hemminger
2008-11-18  1:38   ` Stephen Hemminger
2008-11-18 21:18     ` Francois Romieu
2008-11-20  6:07       ` David Miller
2008-11-20 19:55         ` Francois Romieu
2008-11-17 23:42 ` [PATCH 17/33] 8139: " Stephen Hemminger
2008-11-18  1:39   ` Stephen Hemminger
2008-11-20  6:09     ` David Miller
2008-11-17 23:42 ` [PATCH 18/33] tun: " Stephen Hemminger
2008-11-20  6:10   ` David Miller
2008-11-17 23:42 ` [PATCH 19/33] atl1e: " Stephen Hemminger
2008-11-20  6:12   ` David Miller
2008-11-17 23:42 ` [PATCH 20/33] atlx: " Stephen Hemminger
2008-11-20  6:14   ` David Miller
2008-11-17 23:42 ` [PATCH 21/33] cxgb3: " Stephen Hemminger
2008-11-20  6:15   ` David Miller
2008-11-17 23:42 ` [PATCH 22/33] cxgb2: " Stephen Hemminger
2008-11-18  1:40   ` Stephen Hemminger
2008-11-20  6:17     ` David Miller
2008-11-17 23:42 ` [PATCH 23/33] e1000: " Stephen Hemminger
2008-11-20  6:18   ` David Miller
2008-11-17 23:42 ` [PATCH 24/33] via-velocity: " Stephen Hemminger
2008-11-20  6:19   ` David Miller
2008-11-17 23:42 ` [PATCH 25/33] igb: " Stephen Hemminger
2008-11-20  6:21   ` David Miller
2008-11-17 23:42 ` [PATCH 26/33] e100: " Stephen Hemminger
2008-11-20  6:22   ` David Miller
2008-11-17 23:42 ` [PATCH 27/33] ppp: " Stephen Hemminger
2008-11-20  6:22   ` David Miller
2008-11-17 23:42 ` Stephen Hemminger [this message]
2008-11-20  6:23   ` [PATCH 28/33] enic: " David Miller
2008-11-17 23:42 ` [PATCH 29/33] ixgb: " Stephen Hemminger
2008-11-20  6:24   ` David Miller
2008-11-17 23:42 ` [PATCH 30/33] tg3: " Stephen Hemminger
2008-11-18  0:42   ` Matt Carlson
2008-11-18  1:37   ` Stephen Hemminger
2008-11-19 21:04     ` Matt Carlson
2008-11-19 21:07       ` Stephen Hemminger
2008-11-20  1:21         ` David Miller
2008-11-20  6:25     ` David Miller
2008-11-17 23:42 ` [PATCH 31/33] forcedeth: " Stephen Hemminger
2008-11-20  6:27   ` David Miller
2008-11-17 23:42 ` [PATCH 32/33] niu: " Stephen Hemminger
2008-11-20  6:28   ` David Miller
2008-11-17 23:42 ` [PATCH 33/33] acenic: " Stephen Hemminger
2008-11-20  6:29   ` David Miller
2008-11-18  1:27 ` [PATCH 00/33] Network Devices Ops (v0.3) Jeff Kirsher
2008-11-18  1:35   ` Stephen Hemminger
2008-11-18  1:43     ` Jeff Kirsher
2008-11-19 21:55     ` Jeff Kirsher
2008-11-19 22:04       ` David Miller
2008-11-20  1:33 ` David Miller
2008-11-20  3:02   ` Stephen Hemminger
2008-11-20  5:21     ` Eric Dumazet
2008-11-20  5:25       ` David Miller
2008-11-20  6:15         ` Alexey Dobriyan
2008-11-20  6:37           ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081117234357.173505630@vyatta.com \
    --to=shemminger@vyatta.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).