treewide: replace dev->trans_start update with helper
Replace all trans_start updates with netif_trans_update helper. change was done via spatch: struct net_device *d; @@ - d->trans_start = jiffies + netif_trans_update(d) Compile tested only. Cc: user-mode-linux-devel@lists.sourceforge.net Cc: linux-xtensa@linux-xtensa.org Cc: linux1394-devel@lists.sourceforge.net Cc: linux-rdma@vger.kernel.org Cc: netdev@vger.kernel.org Cc: MPT-FusionLinux.pdl@broadcom.com Cc: linux-scsi@vger.kernel.org Cc: linux-can@vger.kernel.org Cc: linux-parisc@vger.kernel.org Cc: linux-omap@vger.kernel.org Cc: linux-hams@vger.kernel.org Cc: linux-usb@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: linux-s390@vger.kernel.org Cc: devel@driverdev.osuosl.org Cc: b.a.t.m.a.n@lists.open-mesh.org Cc: linux-bluetooth@vger.kernel.org Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com> Acked-by: Mugunthan V N <mugunthanvnm@ti.com> Acked-by: Antonio Quartulli <a@unstable.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
此提交包含在:
@@ -376,7 +376,7 @@ static int catc_tx_run(struct catc *catc)
|
||||
catc->tx_idx = !catc->tx_idx;
|
||||
catc->tx_ptr = 0;
|
||||
|
||||
catc->netdev->trans_start = jiffies;
|
||||
netif_trans_update(catc->netdev);
|
||||
return status;
|
||||
}
|
||||
|
||||
@@ -389,7 +389,7 @@ static void catc_tx_done(struct urb *urb)
|
||||
if (status == -ECONNRESET) {
|
||||
dev_dbg(&urb->dev->dev, "Tx Reset.\n");
|
||||
urb->status = 0;
|
||||
catc->netdev->trans_start = jiffies;
|
||||
netif_trans_update(catc->netdev);
|
||||
catc->netdev->stats.tx_errors++;
|
||||
clear_bit(TX_RUNNING, &catc->flags);
|
||||
netif_wake_queue(catc->netdev);
|
||||
|
@@ -938,7 +938,7 @@ static void kaweth_tx_timeout(struct net_device *net)
|
||||
|
||||
dev_warn(&net->dev, "%s: Tx timed out. Resetting.\n", net->name);
|
||||
kaweth->stats.tx_errors++;
|
||||
net->trans_start = jiffies;
|
||||
netif_trans_update(net);
|
||||
|
||||
usb_unlink_urb(kaweth->tx_urb);
|
||||
}
|
||||
|
@@ -3045,7 +3045,7 @@ gso_skb:
|
||||
ret = usb_submit_urb(urb, GFP_ATOMIC);
|
||||
switch (ret) {
|
||||
case 0:
|
||||
dev->net->trans_start = jiffies;
|
||||
netif_trans_update(dev->net);
|
||||
lan78xx_queue_skb(&dev->txq, skb, tx_start);
|
||||
if (skb_queue_len(&dev->txq) >= dev->tx_qlen)
|
||||
netif_stop_queue(dev->net);
|
||||
@@ -3729,7 +3729,7 @@ int lan78xx_resume(struct usb_interface *intf)
|
||||
usb_free_urb(res);
|
||||
usb_autopm_put_interface_async(dev->intf);
|
||||
} else {
|
||||
dev->net->trans_start = jiffies;
|
||||
netif_trans_update(dev->net);
|
||||
lan78xx_queue_skb(&dev->txq, skb, tx_start);
|
||||
}
|
||||
}
|
||||
|
@@ -615,7 +615,7 @@ static void write_bulk_callback(struct urb *urb)
|
||||
break;
|
||||
}
|
||||
|
||||
net->trans_start = jiffies; /* prevent tx timeout */
|
||||
netif_trans_update(net); /* prevent tx timeout */
|
||||
netif_wake_queue(net);
|
||||
}
|
||||
|
||||
|
@@ -451,7 +451,7 @@ static void write_bulk_callback(struct urb *urb)
|
||||
if (status)
|
||||
dev_info(&urb->dev->dev, "%s: Tx status %d\n",
|
||||
dev->netdev->name, status);
|
||||
dev->netdev->trans_start = jiffies;
|
||||
netif_trans_update(dev->netdev);
|
||||
netif_wake_queue(dev->netdev);
|
||||
}
|
||||
|
||||
@@ -694,7 +694,7 @@ static netdev_tx_t rtl8150_start_xmit(struct sk_buff *skb,
|
||||
} else {
|
||||
netdev->stats.tx_packets++;
|
||||
netdev->stats.tx_bytes += skb->len;
|
||||
netdev->trans_start = jiffies;
|
||||
netif_trans_update(netdev);
|
||||
}
|
||||
|
||||
return NETDEV_TX_OK;
|
||||
|
@@ -1416,7 +1416,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb,
|
||||
"tx: submit urb err %d\n", retval);
|
||||
break;
|
||||
case 0:
|
||||
net->trans_start = jiffies;
|
||||
netif_trans_update(net);
|
||||
__usbnet_queue_skb(&dev->txq, skb, tx_start);
|
||||
if (dev->txq.qlen >= TX_QLEN (dev))
|
||||
netif_stop_queue (net);
|
||||
@@ -1845,7 +1845,7 @@ int usbnet_resume (struct usb_interface *intf)
|
||||
usb_free_urb(res);
|
||||
usb_autopm_put_interface_async(dev->intf);
|
||||
} else {
|
||||
dev->net->trans_start = jiffies;
|
||||
netif_trans_update(dev->net);
|
||||
__skb_queue_tail(&dev->txq, skb);
|
||||
}
|
||||
}
|
||||
|
新增問題並參考
封鎖使用者