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
/
tehuti
/
tehuti.c
diff --git
a/drivers/net/ethernet/tehuti/tehuti.c
b/drivers/net/ethernet/tehuti/tehuti.c
index f7050c573519245381db1acd71a02092d3b8a1b1..571452e786d5103460180e54481cd11ae88e4927 100644
(file)
--- a/
drivers/net/ethernet/tehuti/tehuti.c
+++ b/
drivers/net/ethernet/tehuti/tehuti.c
@@
-1148,7
+1148,7
@@
NETIF_RX_MUX(struct bdx_priv *priv, u32 rxd_val1, u16 rxd_vlan,
priv->ndev->name,
GET_RXD_VLAN_ID(rxd_vlan),
GET_RXD_VTAG(rxd_val1));
- __vlan_hwaccel_put_tag(skb, GET_RXD_VLAN_TCI(rxd_vlan));
+ __vlan_hwaccel_put_tag(skb,
htons(ETH_P_8021Q),
GET_RXD_VLAN_TCI(rxd_vlan));
}
netif_receive_skb(skb);
}