From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linville@tuxdriver.com,
Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next v2 06/12] net: dsa: allow switches to work without tagging
Date: Tue, 5 Aug 2014 15:31:40 -0700 [thread overview]
Message-ID: <1407277906-19989-7-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1407277906-19989-1-git-send-email-f.fainelli@gmail.com>
In case switch port tagging is disabled (voluntarily, or the switch just
does not support it), allow us to continue using the master net_device
operations instead of the tag-specific ones.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
net/dsa/slave.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index b4b6d457bfd0..d1dfa3d8552f 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -332,6 +332,28 @@ static const struct net_device_ops trailer_netdev_ops = {
};
#endif
+static netdev_tx_t dsa_slave_dummy_xmit(struct sk_buff *skb,
+ struct net_device *dev)
+{
+ struct dsa_slave_priv *p = netdev_priv(dev);
+
+ skb->dev = p->parent->dst->master_netdev;
+ dev_queue_xmit(skb);
+
+ return NETDEV_TX_OK;
+}
+
+static const struct net_device_ops dummy_netdev_ops = {
+ .ndo_init = dsa_slave_init,
+ .ndo_open = dsa_slave_open,
+ .ndo_stop = dsa_slave_close,
+ .ndo_start_xmit = dsa_slave_dummy_xmit,
+ .ndo_change_rx_flags = dsa_slave_change_rx_flags,
+ .ndo_set_rx_mode = dsa_slave_set_rx_mode,
+ .ndo_set_mac_address = dsa_slave_set_mac_address,
+ .ndo_do_ioctl = dsa_slave_ioctl,
+};
+
static void dsa_slave_adjust_link(struct net_device *dev)
{
struct dsa_slave_priv *p = netdev_priv(dev);
@@ -432,7 +454,8 @@ dsa_slave_create(struct dsa_switch *ds, struct device *parent,
break;
#endif
default:
- BUG();
+ slave_dev->netdev_ops = &dummy_netdev_ops;
+ break;
}
SET_NETDEV_DEV(slave_dev, parent);
--
1.9.1
next prev parent reply other threads:[~2014-08-05 22:32 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-05 22:31 [PATCH net-next v2 00/12] dsa: support for Broadcom Starfighter 2 Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 01/12] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 02/12] net: dsa: add Broadcom tag hook Florian Fainelli
2014-08-06 12:25 ` Sergei Shtylyov
2014-08-06 14:47 ` Alexander Duyck
2014-08-06 18:37 ` Florian Fainelli
2014-08-06 20:16 ` Alexander Duyck
2014-08-05 22:31 ` [PATCH net-next v2 03/12] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 04/12] net: dsa: retain a per-port device_node pointer Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 05/12] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-05 22:31 ` Florian Fainelli [this message]
2014-08-05 22:31 ` [PATCH net-next v2 07/12] net: dsa: allow drivers to do link adjustment Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 08/12] net: dsa: allow updating fixed PHY link information Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 09/12] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 10/12] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 11/12] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-05 22:31 ` [PATCH net-next v2 12/12] Documentation: devicetree: add Broadcom Starfighter 2 binding Florian Fainelli
2014-08-05 22:38 ` [PATCH net-next v2 00/12] dsa: support for Broadcom Starfighter 2 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=1407277906-19989-7-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=davem@davemloft.net \
--cc=linville@tuxdriver.com \
--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).