diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2018-11-08 18:18:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-11-08 23:45:04 -0500 |
commit | 3149a2711bac22a673bc4b9e99d0ace2d23e11da (patch) | |
tree | 8b45031c4091f5aff89bec23afc545d4652b89f4 | |
parent | 4b17f9fe48c001d8fbcb7995df33a502dac25ae6 (diff) |
sky2: use __vlan_hwaccel helpers
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 697d9b374f5e..c7cd0081058e 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c | |||
@@ -2485,13 +2485,11 @@ static struct sk_buff *receive_copy(struct sky2_port *sky2, | |||
2485 | skb->ip_summed = re->skb->ip_summed; | 2485 | skb->ip_summed = re->skb->ip_summed; |
2486 | skb->csum = re->skb->csum; | 2486 | skb->csum = re->skb->csum; |
2487 | skb_copy_hash(skb, re->skb); | 2487 | skb_copy_hash(skb, re->skb); |
2488 | skb->vlan_proto = re->skb->vlan_proto; | 2488 | __vlan_hwaccel_copy_tag(skb, re->skb); |
2489 | skb->vlan_tci = re->skb->vlan_tci; | ||
2490 | 2489 | ||
2491 | pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr, | 2490 | pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr, |
2492 | length, PCI_DMA_FROMDEVICE); | 2491 | length, PCI_DMA_FROMDEVICE); |
2493 | re->skb->vlan_proto = 0; | 2492 | __vlan_hwaccel_clear_tag(re->skb); |
2494 | re->skb->vlan_tci = 0; | ||
2495 | skb_clear_hash(re->skb); | 2493 | skb_clear_hash(re->skb); |
2496 | re->skb->ip_summed = CHECKSUM_NONE; | 2494 | re->skb->ip_summed = CHECKSUM_NONE; |
2497 | skb_put(skb, length); | 2495 | skb_put(skb, length); |