OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4b17f9f
)
sky2: use __vlan_hwaccel helpers
author
Michał Mirosław
<mirq-linux@rere.qmqm.pl>
Thu, 8 Nov 2018 23:18:06 +0000
(
00:18
+0100)
committer
David S. Miller
<davem@davemloft.net>
Fri, 9 Nov 2018 04:45:04 +0000
(20:45 -0800)
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/sky2.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/marvell/sky2.c
b/drivers/net/ethernet/marvell/sky2.c
index
697d9b3
..
c7cd008
100644
(file)
--- 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,
skb->ip_summed = re->skb->ip_summed;
skb->csum = re->skb->csum;
skb_copy_hash(skb, re->skb);
- skb->vlan_proto = re->skb->vlan_proto;
- skb->vlan_tci = re->skb->vlan_tci;
+ __vlan_hwaccel_copy_tag(skb, re->skb);
pci_dma_sync_single_for_device(sky2->hw->pdev, re->data_addr,
length, PCI_DMA_FROMDEVICE);
- re->skb->vlan_proto = 0;
- re->skb->vlan_tci = 0;
+ __vlan_hwaccel_clear_tag(re->skb);
skb_clear_hash(re->skb);
re->skb->ip_summed = CHECKSUM_NONE;
skb_put(skb, length);