Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933322AbbHZBht (ORCPT ); Tue, 25 Aug 2015 21:37:49 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:35453 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932758AbbHZBhr (ORCPT ); Tue, 25 Aug 2015 21:37:47 -0400 Date: Tue, 25 Aug 2015 18:37:45 -0700 From: Guenter Roeck To: Florian Fainelli Cc: Vivien Didelot , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Andrew Lunn Subject: Re: [PATCH net] net: dsa: fix EDSA frame from hwaccel frame Message-ID: <20150826013745.GA1342@roeck-us.net> References: <1438670111-31051-1-git-send-email-vivien.didelot@savoirfairelinux.com> <55DD1642.2020301@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <55DD1642.2020301@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1890 Lines: 59 On Tue, Aug 25, 2015 at 06:28:34PM -0700, Florian Fainelli wrote: > Le 08/03/15 23:35, Vivien Didelot a ?crit : > > If the underlying network device features NETIF_F_HW_VLAN_CTAG_TX, > > an EDSA frame is prepended with a 802.1q header once queued. > > > > To fix this, push the VLAN tag to the payload if present, before > > checking the frame protocol. > > Makes sense, but you would want Andrew or Guenter to ack this patch. > I'll have to carve out some time soon to see if the current dsa code still works for me. Just don't know when and how to do that :-( Guenter > Thanks! > > > > > [note: we may prefer to access directly VLAN TCI from hwaccel frames, > > but this approach is simpler.] > > > > Signed-off-by: Vivien Didelot > > --- > > net/dsa/tag_edsa.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c > > index 2288c80..3ada4eb 100644 > > --- a/net/dsa/tag_edsa.c > > +++ b/net/dsa/tag_edsa.c > > @@ -9,6 +9,7 @@ > > */ > > > > #include > > +#include > > #include > > #include > > #include "dsa_priv.h" > > @@ -21,6 +22,10 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) > > struct dsa_slave_priv *p = netdev_priv(dev); > > u8 *edsa_header; > > > > + skb = vlan_hwaccel_push_inside(skb); > > + if (unlikely(!skb)) > > + return NULL; > > + > > /* > > * Convert the outermost 802.1q tag to a DSA tag and prepend > > * a DSA ethertype field is the packet is tagged, or insert > > > > > -- > Florian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/