From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oliver Neukum Subject: Re: [PATCH net-next 15/19] net: usb: aqc111: Add support for VLAN_CTAG_TX/RX offload Date: Mon, 08 Oct 2018 16:14:18 +0200 Message-ID: <1539008058.10342.23.camel@suse.com> References: <7d3c26e57edd4cc4f0995e66ec71be9d1c8f53d9.1538734658.git.igor.russkikh@aquantia.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: Dmitry Bezrukov , "linux-usb@vger.kernel.org" , "netdev@vger.kernel.org" To: Igor Russkikh , "David S . Miller" Return-path: Received: from mx2.suse.de ([195.135.220.15]:55838 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726078AbeJHVfF (ORCPT ); Mon, 8 Oct 2018 17:35:05 -0400 In-Reply-To: <7d3c26e57edd4cc4f0995e66ec71be9d1c8f53d9.1538734658.git.igor.russkikh@aquantia.com> Sender: netdev-owner@vger.kernel.org List-ID: On Fr, 2018-10-05 at 10:25 +0000, Igor Russkikh wrote: > From: Dmitry Bezrukov > > Signed-off-by: Dmitry Bezrukov > Signed-off-by: Igor Russkikh > --- > drivers/net/usb/aqc111.c | 14 ++++++++++++++ > drivers/net/usb/aqc111.h | 7 ++++++- > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/usb/aqc111.c b/drivers/net/usb/aqc111.c > index cc23c39beab3..a9051dd7c5bd 100644 > --- a/drivers/net/usb/aqc111.c > +++ b/drivers/net/usb/aqc111.c > @@ -524,6 +524,7 @@ static int aqc111_bind(struct usbnet *dev, struct usb_interface *intf) > > dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; > dev->net->features |= AQ_SUPPORT_FEATURE; > + dev->net->vlan_features |= AQ_SUPPORT_VLAN_FEATURE; > > aqc111_read_fw_version(dev, aqc111_data); > aqc111_data->autoneg = AUTONEG_ENABLE; > @@ -817,6 +818,7 @@ static int aqc111_reset(struct usbnet *dev) > > dev->net->hw_features |= AQ_SUPPORT_HW_FEATURE; > dev->net->features |= AQ_SUPPORT_FEATURE; > + dev->net->vlan_features |= AQ_SUPPORT_VLAN_FEATURE; > > /* Power up ethernet PHY */ > aqc111_data->phy_ops.advertising = 0; > @@ -992,6 +994,11 @@ static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb) > new_skb->truesize = new_skb->len + sizeof(struct sk_buff); > if (aqc111_data->rx_checksum) > aqc111_rx_checksum(new_skb, &pkt_desc); > + if (pkt_desc->vlan_ind) > + __vlan_hwaccel_put_tag(new_skb, > + htons(ETH_P_8021Q), > + pkt_desc->vlan_tag & > + VLAN_VID_MASK); > > usbnet_skb_return(dev, new_skb); > if (pkt_count == 0) > @@ -1020,6 +1027,7 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, > int tailroom = 0; > int padding_size = 0; > struct sk_buff *new_skb = NULL; > + u16 tci = 0; > > memset(&tx_hdr, 0x00, sizeof(tx_hdr)); > > @@ -1038,6 +1046,12 @@ static struct sk_buff *aqc111_tx_fixup(struct usbnet *dev, struct sk_buff *skb, > tx_hdr.drop_padding = 1; > } > > + /* Vlan Tag */ > + if (vlan_get_tag(skb, &tci) >= 0) { > + tx_hdr.vlan_tag = 1; > + tx_hdr.vlan_info = tci; Endianness Regards Oliver