diff options
| author |   Nimrod Andy <B38611@freescale.com> | 2015-03-10 19:09:41 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-10 13:37:01 -0400 |
| commit | af5cbc9822f6bbe399925760a4d5ee82c21f258c (patch) | |
| tree | 1cd20c2124b92f9210a6d063f059633361122e87 /drivers/net/ethernet/freescale/fec_main.c | |
| parent | net: WIZnet drivers: enable interrupts after napi_complete() (diff) | |
| download | linux-dev-af5cbc9822f6bbe399925760a4d5ee82c21f258c.tar.xz linux-dev-af5cbc9822f6bbe399925760a4d5ee82c21f258c.zip | |
net: fec: fix receive VLAN CTAG HW acceleration issue
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.
V2:
Michael Grzeschik suggest to use memmove() instead of skb_copy_to_linear_data_offset().
Reported-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Fixes: 1b7bde6d659d ("net: fec: implement rx_copybreak to improve rx performance")
Signed-off-by: Fugang Duan <B38611@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 99492b7e3713..787db5026191 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1479,8 +1479,7 @@ fec_enet_rx_queue(struct net_device *ndev, int budget, u16 queue_id) vlan_packet_rcvd = true; - skb_copy_to_linear_data_offset(skb, VLAN_HLEN, - data, (2 * ETH_ALEN)); + memmove(skb->data + VLAN_HLEN, data, ETH_ALEN * 2); skb_pull(skb, VLAN_HLEN); } |