Netdev List
 help / color / mirror / Atom feed
From: Michael Grzeschik <mgr@pengutronix.de>
To: Fugang Duan <b38611@freescale.com>
Cc: davem@davemloft.net, netdev@vger.kernel.org, kernel@pengutronix.de
Subject: Re: [PATCH] net: fec: fix receive VLAN CTAG HW acceleration issue
Date: Tue, 10 Mar 2015 12:04:52 +0100	[thread overview]
Message-ID: <20150310110452.GA22614@pengutronix.de> (raw)
In-Reply-To: <1425983442-21302-1-git-send-email-b38611@freescale.com>

On Tue, Mar 10, 2015 at 06:30:42PM +0800, Fugang Duan wrote:
> The current driver support receive VLAN CTAG HW acceleration feature
> (NETIF_F_HW_VLAN_CTAG_RX) through software simulation. There calls the
> api .skb_copy_to_linear_data_offset() to skip the VLAN tag, but there
> have overlap between the two memory data point range. The patch just fix
> the issue.
> 
> Reported-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
> Signed-off-by: Fugang Duan <B38611@freescale.com>
> ---
>  drivers/net/ethernet/freescale/fec_main.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
> index 9bb6220..c9b1dbb 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1475,12 +1475,14 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id)
>  			/* Push and remove the vlan tag */
>  			struct vlan_hdr *vlan_header =
>  					(struct vlan_hdr *) (data + ETH_HLEN);
> +			unsigned char eth_hdr[12];
>  			vlan_tag = ntohs(vlan_header->h_vlan_TCI);
>  
>  			vlan_packet_rcvd = true;
>  
> +			memcpy(eth_hdr, data, 2 * ETH_ALEN);
>  			skb_copy_to_linear_data_offset(skb, VLAN_HLEN,
> -						       data, (2 * ETH_ALEN));
> +						       eth_hdr, (2 * ETH_ALEN));
>  			skb_pull(skb, VLAN_HLEN);
>  		}
>  
> -- 
> 1.7.8

why not just use memmove instead of the skb_copy_to_linear_data_offset?

memmove(skb->data + VLAN_HLEN, data, (2 * ETH_ALEN));

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

  reply	other threads:[~2015-03-10 11:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-10 10:30 [PATCH] net: fec: fix receive VLAN CTAG HW acceleration issue Fugang Duan
2015-03-10 11:04 ` Michael Grzeschik [this message]
2015-03-10 11:13   ` fugang.duan
2015-03-10 16:40 ` David Miller

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=20150310110452.GA22614@pengutronix.de \
    --to=mgr@pengutronix.de \
    --cc=b38611@freescale.com \
    --cc=davem@davemloft.net \
    --cc=kernel@pengutronix.de \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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