aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/ibmtr.c1
-rw-r--r--drivers/net/tokenring/smctr.c2
-rw-r--r--drivers/net/tokenring/tms380tr.c2
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index eebdaae24328..91e6c78271a3 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -1041,7 +1041,6 @@ static netdev_tx_t tok_send_packet(struct sk_buff *skb,
1041 writew(ti->exsap_station_id, ti->srb + STATION_ID_OFST); 1041 writew(ti->exsap_station_id, ti->srb + STATION_ID_OFST);
1042 writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD); 1042 writeb(CMD_IN_SRB, ti->mmio + ACA_OFFSET + ACA_SET + ISRA_ODD);
1043 spin_unlock_irqrestore(&(ti->lock), flags); 1043 spin_unlock_irqrestore(&(ti->lock), flags);
1044 dev->trans_start = jiffies;
1045 return NETDEV_TX_OK; 1044 return NETDEV_TX_OK;
1046} 1045}
1047 1046
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index e40560137c46..213b9affc22a 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -4562,7 +4562,7 @@ static void smctr_timeout(struct net_device *dev)
4562 * fake transmission time and go on trying. Our own timeout 4562 * fake transmission time and go on trying. Our own timeout
4563 * routine is in sktr_timer_chk() 4563 * routine is in sktr_timer_chk()
4564 */ 4564 */
4565 dev->trans_start = jiffies; 4565 dev->trans_start = jiffies; /* prevent tx timeout */
4566 netif_wake_queue(dev); 4566 netif_wake_queue(dev);
4567} 4567}
4568 4568
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c
index c169fd05dde0..8cb126a80070 100644
--- a/drivers/net/tokenring/tms380tr.c
+++ b/drivers/net/tokenring/tms380tr.c
@@ -592,7 +592,7 @@ static void tms380tr_timeout(struct net_device *dev)
592 * fake transmission time and go on trying. Our own timeout 592 * fake transmission time and go on trying. Our own timeout
593 * routine is in tms380tr_timer_chk() 593 * routine is in tms380tr_timer_chk()
594 */ 594 */
595 dev->trans_start = jiffies; 595 dev->trans_start = jiffies; /* prevent tx timeout */
596 netif_wake_queue(dev); 596 netif_wake_queue(dev);
597} 597}
598 598