projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
jme.c
diff --git
a/drivers/net/ethernet/jme.c
b/drivers/net/ethernet/jme.c
index d28ce6f9717285eec333ac34a825dc792b2afa18..070a6f1a057745a803d3a6ccd6d8201644e95703 100644
(file)
--- a/
drivers/net/ethernet/jme.c
+++ b/
drivers/net/ethernet/jme.c
@@
-1059,7
+1059,7
@@
jme_alloc_and_feed_skb(struct jme_adapter *jme, int idx)
if (rxdesc->descwb.flags & cpu_to_le16(RXWBFLAG_TAGON)) {
u16 vid = le16_to_cpu(rxdesc->descwb.vlan);
- __vlan_hwaccel_put_tag(skb, vid);
+ __vlan_hwaccel_put_tag(skb,
htons(ETH_P_8021Q),
vid);
NET_STAT(jme).rx_bytes += 4;
}
jme->jme_rx(skb);