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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[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 0519afa413d22714b88e355f1cea862f11650cba..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);
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);
NET_STAT(jme).rx_bytes += 4;
}
jme->jme_rx(skb);
@@
-3030,8
+3030,8
@@
jme_init_one(struct pci_dev *pdev,
NETIF_F_SG |
NETIF_F_TSO |
NETIF_F_TSO6 |
NETIF_F_SG |
NETIF_F_TSO |
NETIF_F_TSO6 |
- NETIF_F_HW_VLAN_TX |
- NETIF_F_HW_VLAN_RX;
+ NETIF_F_HW_VLAN_
CTAG_
TX |
+ NETIF_F_HW_VLAN_
CTAG_
RX;
if (using_dac)
netdev->features |= NETIF_F_HIGHDMA;
if (using_dac)
netdev->features |= NETIF_F_HIGHDMA;