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 develop-3.10
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
ethernet
/
sun
/
sunvnet.c
diff --git
a/drivers/net/ethernet/sun/sunvnet.c
b/drivers/net/ethernet/sun/sunvnet.c
index 398faff8be7a26737b84071961ee05c5768c5da1..ade8bdfc03afa0673ef2052348e33138e3e0115f 100644
(file)
--- a/
drivers/net/ethernet/sun/sunvnet.c
+++ b/
drivers/net/ethernet/sun/sunvnet.c
@@
-656,7
+656,7
@@
static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
spin_lock_irqsave(&port->vio.lock, flags);
dr = &port->vio.drings[VIO_DRIVER_TX_RING];
spin_lock_irqsave(&port->vio.lock, flags);
dr = &port->vio.drings[VIO_DRIVER_TX_RING];
- if (unlikely(vnet_tx_dring_avail(dr) <
2
)) {
+ if (unlikely(vnet_tx_dring_avail(dr) <
1
)) {
if (!netif_queue_stopped(dev)) {
netif_stop_queue(dev);
if (!netif_queue_stopped(dev)) {
netif_stop_queue(dev);
@@
-704,7
+704,7
@@
static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->stats.tx_bytes += skb->len;
dr->prod = (dr->prod + 1) & (VNET_TX_RING_SIZE - 1);
dev->stats.tx_bytes += skb->len;
dr->prod = (dr->prod + 1) & (VNET_TX_RING_SIZE - 1);
- if (unlikely(vnet_tx_dring_avail(dr) <
2
)) {
+ if (unlikely(vnet_tx_dring_avail(dr) <
1
)) {
netif_stop_queue(dev);
if (vnet_tx_dring_avail(dr) > VNET_TX_WAKEUP_THRESH(dr))
netif_wake_queue(dev);
netif_stop_queue(dev);
if (vnet_tx_dring_avail(dr) > VNET_TX_WAKEUP_THRESH(dr))
netif_wake_queue(dev);