lkml.org 
[lkml]   [2020]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH net-next 2/4] net: dsa: b53: Set untag_bridge_pvid
Date
On Thu, Oct 01, 2020 at 07:42:13PM -0700, Florian Fainelli wrote:
> Indicate to the DSA receive path that we need to untage the bridge PVID,
> this allows us to remove the dsa_untag_bridge_pvid() calls from
> net/dsa/tag_brcm.c.
>
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

> drivers/net/dsa/b53/b53_common.c | 1 +
> net/dsa/tag_brcm.c | 15 ++-------------
> 2 files changed, 3 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
> index 73507cff3bc4..ce18ba0b74eb 100644
> --- a/drivers/net/dsa/b53/b53_common.c
> +++ b/drivers/net/dsa/b53/b53_common.c
> @@ -2603,6 +2603,7 @@ struct b53_device *b53_switch_alloc(struct device *base,
> dev->ops = ops;
> ds->ops = &b53_switch_ops;
> ds->configure_vlan_while_not_filtering = true;
> + ds->untag_bridge_pvid = true;
> dev->vlan_enabled = ds->configure_vlan_while_not_filtering;
> mutex_init(&dev->reg_mutex);
> mutex_init(&dev->stats_mutex);
> diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
> index 69d6b8c597a9..ad72dff8d524 100644
> --- a/net/dsa/tag_brcm.c
> +++ b/net/dsa/tag_brcm.c
> @@ -152,11 +152,6 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb,
> /* Remove Broadcom tag and update checksum */
> skb_pull_rcsum(skb, BRCM_TAG_LEN);
>
> - /* Set the MAC header to where it should point for
> - * dsa_untag_bridge_pvid() to parse the correct VLAN header.
> - */
> - skb_set_mac_header(skb, -ETH_HLEN);
> -
> skb->offload_fwd_mark = 1;
>
> return skb;
> @@ -187,7 +182,7 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,
> nskb->data - ETH_HLEN - BRCM_TAG_LEN,
> 2 * ETH_ALEN);
>
> - return dsa_untag_bridge_pvid(nskb);
> + return nskb;
> }
>
> static const struct dsa_device_ops brcm_netdev_ops = {
> @@ -214,14 +209,8 @@ static struct sk_buff *brcm_tag_rcv_prepend(struct sk_buff *skb,
> struct net_device *dev,
> struct packet_type *pt)
> {
> - struct sk_buff *nskb;
> -
> /* tag is prepended to the packet */
> - nskb = brcm_tag_rcv_ll(skb, dev, pt, ETH_HLEN);
> - if (!nskb)
> - return nskb;
> -
> - return dsa_untag_bridge_pvid(nskb);
> + return brcm_tag_rcv_ll(skb, dev, pt, ETH_HLEN);
> }
>
> static const struct dsa_device_ops brcm_prepend_netdev_ops = {
> --
> 2.25.1
>
\
 
 \ /
  Last update: 2020-10-02 10:41    [W:0.059 / U:0.496 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site