From: Stephen Hemminger <shemminger@vyatta•com>
To: David Miller <davem@davemloft•net>,
Lennert Buytenhek <buytenh@marvell•com>
Cc: netdev@vger•kernel.org
Subject: [PATCH 4/8] dsa: convert to net_device_ops
Date: Mon, 05 Jan 2009 12:14:46 -0800 [thread overview]
Message-ID: <20090105201514.550766759@vyatta.com> (raw)
In-Reply-To: 20090105201442.749889072@vyatta.com
[-- Attachment #1: dsa.patch --]
[-- Type: text/plain, Size: 2450 bytes --]
Convert this driver to use net_device_ops
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
--- a/net/dsa/slave.c 2009-01-01 23:05:35.001587658 -0800
+++ b/net/dsa/slave.c 2009-01-01 23:11:20.485585998 -0800
@@ -286,6 +286,39 @@ static const struct ethtool_ops dsa_slav
.get_sset_count = dsa_slave_get_sset_count,
};
+static int dsa_start_xmit(struct sk_buff *skb, struct net_device *dev)
+{
+ struct dsa_slave_priv *p = netdev_priv(dev);
+ struct dsa_switch *ds = p->parent;
+
+ switch (ds->tag_protocol) {
+#ifdef CONFIG_NET_DSA_TAG_DSA
+ case htons(ETH_P_DSA):
+ return dsa_xmit(skb, dev);
+#endif
+#ifdef CONFIG_NET_DSA_TAG_EDSA
+ case htons(ETH_P_EDSA):
+ return edsa_xmit(skb, dev);
+#endif
+#ifdef CONFIG_NET_DSA_TAG_TRAILER
+ case htons(ETH_P_TRAILER):
+ return trailer_xmit(skb, dev);
+#endif
+ default:
+ BUG();
+ }
+}
+
+static const struct net_device_ops dsa_netdev_ops = {
+ .ndo_open = dsa_slave_open,
+ .ndo_stop = dsa_slave_close,
+ .ndo_start_xmit = dsa_start_xmit,
+ .ndo_change_rx_flags = dsa_slave_change_rx_flags,
+ .ndo_set_rx_mode = dsa_slave_set_rx_mode,
+ .ndo_set_multicast_list = dsa_slave_set_rx_mode,
+ .ndo_set_mac_address = dsa_slave_set_mac_address,
+ .ndo_do_ioctl = dsa_slave_ioctl,
+};
/* slave device setup *******************************************************/
struct net_device *
@@ -306,32 +339,7 @@ dsa_slave_create(struct dsa_switch *ds,
SET_ETHTOOL_OPS(slave_dev, &dsa_slave_ethtool_ops);
memcpy(slave_dev->dev_addr, master->dev_addr, ETH_ALEN);
slave_dev->tx_queue_len = 0;
- switch (ds->tag_protocol) {
-#ifdef CONFIG_NET_DSA_TAG_DSA
- case htons(ETH_P_DSA):
- slave_dev->hard_start_xmit = dsa_xmit;
- break;
-#endif
-#ifdef CONFIG_NET_DSA_TAG_EDSA
- case htons(ETH_P_EDSA):
- slave_dev->hard_start_xmit = edsa_xmit;
- break;
-#endif
-#ifdef CONFIG_NET_DSA_TAG_TRAILER
- case htons(ETH_P_TRAILER):
- slave_dev->hard_start_xmit = trailer_xmit;
- break;
-#endif
- default:
- BUG();
- }
- slave_dev->open = dsa_slave_open;
- slave_dev->stop = dsa_slave_close;
- slave_dev->change_rx_flags = dsa_slave_change_rx_flags;
- slave_dev->set_rx_mode = dsa_slave_set_rx_mode;
- slave_dev->set_multicast_list = dsa_slave_set_rx_mode;
- slave_dev->set_mac_address = dsa_slave_set_mac_address;
- slave_dev->do_ioctl = dsa_slave_ioctl;
+ slave_dev->netdev_ops = &dsa_netdev_ops;
SET_NETDEV_DEV(slave_dev, parent);
slave_dev->vlan_features = master->vlan_features;
--
next prev parent reply other threads:[~2009-01-05 20:24 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-05 20:14 [PATCH 0/8] More net_device ops Stephen Hemminger
2009-01-05 20:14 ` [PATCH 2/8] bonding: use net_device_ops Stephen Hemminger
2009-01-06 18:42 ` David Miller
2009-01-05 20:14 ` [PATCH 3/8] wireless: convert wireless ioctl to net_device_ops Stephen Hemminger
[not found] ` <20090105201514.442703045-ZtmgI6mnKB3QT0dZR+AlfA@public.gmane.org>
2009-01-06 18:42 ` David Miller
2009-01-05 20:14 ` Stephen Hemminger [this message]
[not found] ` <20090106060705.GG4414@server.marvell.com>
2009-01-06 18:43 ` [PATCH 4/8] dsa: convert " David Miller
2009-01-06 22:51 ` Stephen Hemminger
2009-01-07 0:45 ` David Miller
2009-01-05 20:14 ` [PATCH 5/8] virtio: " Stephen Hemminger
2009-01-06 9:40 ` Mark McLoughlin
2009-01-06 18:44 ` David Miller
2009-01-05 20:14 ` [PATCH 6/8] xen-netfront: " Stephen Hemminger
2009-01-06 0:17 ` Jeremy Fitzhardinge
2009-01-06 18:45 ` David Miller
2009-01-05 20:14 ` [PATCH 7/8] infiniband: driver API update Stephen Hemminger
2009-01-05 21:02 ` Roland Dreier
2009-01-05 21:22 ` [ofa-general] [PATCH 1/3] infiniband: amso100 convert to net_device_ops Stephen Hemminger
2009-01-05 21:22 ` [ofa-general] [PATCH 2/3] infiniband: nes_nic " Stephen Hemminger
2009-01-05 21:23 ` [ofa-general] [PATCH 3/3] infiniband: ipoib " Stephen Hemminger
2009-01-06 5:07 ` Roland Dreier
2009-01-06 18:46 ` [ofa-general] " David Miller
2009-01-06 18:45 ` [ofa-general] Re: [PATCH 7/8] infiniband: driver API update David Miller
2009-01-05 20:14 ` [PATCH 8/8] sch_teql: convert to net_device_ops Stephen Hemminger
2009-01-06 18:46 ` David Miller
[not found] ` <20090105201514.192918670@vyatta.com>
2009-01-06 18:41 ` [PATCH 1/8] irda: convert to internal stats 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=20090105201514.550766759@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=buytenh@marvell$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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