From: Alexander Duyck <alexander.duyck@gmail•com>
To: Florian Fainelli <f.fainelli@gmail•com>, netdev@vger•kernel.org
Cc: davem@davemlof•net, jhs@mojatatu•com, linville@tuxdriver•com,
alexander.h.duyck@intel•com
Subject: Re: [PATCH net-next v3 06/12] net: dsa: allow switches to work without tagging
Date: Sun, 24 Aug 2014 16:27:05 -0700 [thread overview]
Message-ID: <53FA74C9.5090300@gmail.com> (raw)
In-Reply-To: <1408905869-10471-7-git-send-email-f.fainelli@gmail.com>
On 08/24/2014 11:44 AM, Florian Fainelli wrote:
> 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.
>
> dsa_protocol_is_tagged() is updated to check that the switch driver
> tag_protocol field is not 0 to avoid overriding skb->protocol in the
> eth_type_trans().
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail•com>
> ---
> Changes in v3:
> - update logic with the helpers introduced in the firs patch set
> - renamed dummy to notag
>
> include/net/dsa.h | 2 +-
> net/dsa/slave.c | 25 ++++++++++++++++++++++++-
> 2 files changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/include/net/dsa.h b/include/net/dsa.h
> index 89b44e8d2dc3..6620d4722efa 100644
> --- a/include/net/dsa.h
> +++ b/include/net/dsa.h
> @@ -206,7 +206,7 @@ static inline void *ds_to_priv(struct dsa_switch *ds)
> */
> static inline bool dsa_protocol_is_tagged(struct dsa_switch_tree *dst)
> {
> - return dst->tag_protocol != ETH_P_EDSA;
> + return (dst->tag_protocol != 0) && (dst->tag_protocol != ETH_P_EDSA);
> }
>
> static inline __be16 dsa_tag_protocol(struct dsa_switch_tree *dst)
> diff --git a/net/dsa/slave.c b/net/dsa/slave.c
> index b4b6d457bfd0..35cd8b7a56b8 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_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 notag_netdev_ops = {
> + .ndo_init = dsa_slave_init,
> + .ndo_open = dsa_slave_open,
> + .ndo_stop = dsa_slave_close,
> + .ndo_start_xmit = dsa_slave_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 = ¬ag_netdev_ops;
> + break;
> }
>
> SET_NETDEV_DEV(slave_dev, parent);
Actually the more I look at this the more I think it might make sense to
just have a pair of function pointers, maybe even a header ops structure
that is maintained in the dsa_switch_tree for xmit and rcv. Then
instead of having to define 4 slaves each with only one function
different between them you could have just one function that calls the
xmit function pointer contained in the dsa_switch_tree structure.
Thanks,
Alex
next prev parent reply other threads:[~2014-08-24 23:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-24 18:44 [PATCH net-next v3 00/12] dsa: support for Broadcom Starfighter 2 Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 01/12] net: dsa: rework skb->protocol override helpers Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 02/12] net: phy: add generic UniMAC MDIO bus driver Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 03/12] net: dsa: provide a switch device device tree node pointer Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 04/12] net: dsa: retain a per-port device_node pointer Florian Fainelli
2014-08-24 23:32 ` Alexander Duyck
2014-08-25 2:30 ` Florian Fainelli
2014-08-26 0:51 ` Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 05/12] net: dsa: allow for more complex PHY setups Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 06/12] net: dsa: allow switches to work without tagging Florian Fainelli
2014-08-24 23:27 ` Alexander Duyck [this message]
2014-08-24 18:44 ` [PATCH net-next v3 07/12] net: dsa: allow drivers to do link adjustment Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 08/12] net: dsa: allow updating fixed PHY link information Florian Fainelli
2014-08-25 4:56 ` David Miller
2014-08-25 19:33 ` Sergei Shtylyov
2014-08-24 18:44 ` [PATCH net-next v3 09/12] net: dsa: add Broadcom tag RX/TX handler Florian Fainelli
2014-08-24 22:51 ` Alexander Duyck
2014-08-25 2:37 ` Florian Fainelli
2014-08-25 14:51 ` Alexander Duyck
2014-08-24 18:44 ` [PATCH net-next v3 10/12] net: dsa: add Broadcom SF2 switch driver Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 11/12] Documentation: devicetree: update dsa binding with optional properties Florian Fainelli
2014-08-24 18:44 ` [PATCH net-next v3 12/12] Documentation: devicetree: add Broadcom Starfighter 2 binding Florian Fainelli
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=53FA74C9.5090300@gmail.com \
--to=alexander.duyck@gmail$(echo .)com \
--cc=alexander.h.duyck@intel$(echo .)com \
--cc=davem@davemlof$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=jhs@mojatatu$(echo .)com \
--cc=linville@tuxdriver$(echo .)com \
--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