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
/
realtek
/
8139cp.c
diff --git
a/drivers/net/ethernet/realtek/8139cp.c
b/drivers/net/ethernet/realtek/8139cp.c
index 6d03b52e56f1ddc72a8490ceaac6a85f5bf9d161..7d1fb9ad1296e5825da2d845129ef38b51728cd7 100644
(file)
--- a/
drivers/net/ethernet/realtek/8139cp.c
+++ b/
drivers/net/ethernet/realtek/8139cp.c
@@
-431,7
+431,7
@@
static inline void cp_rx_skb (struct cp_private *cp, struct sk_buff *skb,
cp->dev->stats.rx_bytes += skb->len;
if (opts2 & RxVlanTagged)
- __vlan_hwaccel_put_tag(skb, swab16(opts2 & 0xffff));
+ __vlan_hwaccel_put_tag(skb,
htons(ETH_P_8021Q),
swab16(opts2 & 0xffff));
napi_gro_receive(&cp->napi, skb);
}