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
clk: samsung: exynos5433: Add clocks for CMU_G3D domain
[firefly-linux-kernel-4.4.55.git]
/
net
/
core
/
netpoll.c
diff --git
a/net/core/netpoll.c
b/net/core/netpoll.c
index e6645b4f330af1d16607ca0d6d9c9c95fd163dc6..e0ad5d16c9c56947163d81201af07e26d1d3017c 100644
(file)
--- a/
net/core/netpoll.c
+++ b/
net/core/netpoll.c
@@
-79,8
+79,7
@@
static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
if (vlan_tx_tag_present(skb) &&
!vlan_hw_offload_capable(features, skb->vlan_proto)) {
if (vlan_tx_tag_present(skb) &&
!vlan_hw_offload_capable(features, skb->vlan_proto)) {
- skb = __vlan_put_tag(skb, skb->vlan_proto,
- vlan_tx_tag_get(skb));
+ skb = __vlan_hwaccel_push_inside(skb);
if (unlikely(!skb)) {
/* This is actually a packet drop, but we
* don't want the code that calls this
if (unlikely(!skb)) {
/* This is actually a packet drop, but we
* don't want the code that calls this
@@
-88,7
+87,6
@@
static int netpoll_start_xmit(struct sk_buff *skb, struct net_device *dev,
*/
goto out;
}
*/
goto out;
}
- skb->vlan_tci = 0;
}
status = netdev_start_xmit(skb, dev, txq, false);
}
status = netdev_start_xmit(skb, dev, txq, false);