netdev - Re: [PATCH net-next 15/19] net: usb: aqc111: Add support for VLAN_CTAG

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Mon, 08 Oct 2018 16:14:18 +0200
From:   Oliver Neukum <oneukum@...e.com>
To:     Igor Russkikh <Igor.Russkikh@...antia.com>,
        "David S . Miller" <davem@...emloft.net>
Cc:     Dmitry Bezrukov <Dmitry.Bezrukov@...antia.com>,
        "linux-usb@...r.kernel.org" <linux-usb@...r.kernel.org>,
        "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Subject: Re: [PATCH net-next 15/19] net: usb: aqc111: Add support for
 VLAN_CTAG_TX/RX offload

On Fr, 2018-10-05 at 10:25 +0000, Igor Russkikh wrote:
> From: Dmitry Bezrukov <dmitry.bezrukov@...antia.com>
> 
> Signed-off-by: Dmitry Bezrukov <dmitry.bezrukov@...antia.com>
> Signed-off-by: Igor Russkikh <igor.russkikh@...antia.com>
> ---
>  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