drivers: net: virtio_net: Implement a dev_watchdog handler
Subsystems (112)
PATCH v2 1/1 drivers: net: virtio_net: Implement a dev_watchdog handler
Driver virtio_net is not handling error events for TX provided by dev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.
This commit brings back virtnet_reset method to recover TX queues from a error state. That function is called by schedule_work method and it puts the reset function into work queue.
As the error cause is unknown at this moment, it would be better to reset all queues.
---
v1-v2: Tag net-next was included to indentify where patch would be applied.
--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)
drivers/net/virtio_net.c +94 -1
@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {
@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {
@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;
@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];
@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {
@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;
@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev); +u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); +continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + } + +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,
@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)
@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; + + ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs); +if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev); +return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;
@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ; + dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);
@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||
Signature · 1 line
2.17.1
Michael S. Tsirkin
maintainerQuoted 84 lines · Julio Faracco
Driver
virtio_netis not handling error events for TX provided bydev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.This commit brings back
virtnet_resetmethod to recover TX queues from a error state. That function is called byschedule_workmethod and it puts the reset function into work queue.As the error cause is unknown at this moment, it would be better to reset all queues.
Signed-off-by Julio Faracco <[email protected]>Signed-off-by Daiane Mendes <[email protected]>Cc Jason Wang <[email protected]>---
v1-v2: Tagnet-nextwas included to indentify where patch would be applied.--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +11
-1@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev);
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2600
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name);
What does this mean?
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2610
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + }
Can we make the warning less cryptic?
I wonder why don't we get the sq from timeout directly? Would seem cleaner.
Quoted 51 lines
drivers/net/virtio_net.c +37
-0+ +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; +
drivers/net/virtio_net.c static int virtnet_validate(struct virtio_device *vdev) · line 3061
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+ ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs); +if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev);
Is this enough? E.g. all RX mode programming has been lost.
Quoted 18 lines
drivers/net/virtio_net.c +14
-0+return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 3108
Quoted 7 lines
drivers/net/virtio_net.c +1
-0@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ; + dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);
Is there a way to make this tuneable from ethtool?
Quoted 10 lines
drivers/net/virtio_net.c +1
-0@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||Signature · 1 line
2.17.1
Michael S. Tsirkin
maintainerQuoted 84 lines · Julio Faracco
Driver
virtio_netis not handling error events for TX provided bydev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.This commit brings back
virtnet_resetmethod to recover TX queues from a error state. That function is called byschedule_workmethod and it puts the reset function into work queue.As the error cause is unknown at this moment, it would be better to reset all queues.
Signed-off-by Julio Faracco <[email protected]>Signed-off-by Daiane Mendes <[email protected]>Cc Jason Wang <[email protected]>---
v1-v2: Tagnet-nextwas included to indentify where patch would be applied.--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +11
-1@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev);
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2600
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name);
What does this mean?
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2610
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + }
Can we make the warning less cryptic?
I wonder why don't we get the sq from timeout directly? Would seem cleaner.
Quoted 51 lines
drivers/net/virtio_net.c +37
-0+ +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; +
drivers/net/virtio_net.c static int virtnet_validate(struct virtio_device *vdev) · line 3061
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+ ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs); +if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev);
Is this enough? E.g. all RX mode programming has been lost.
Quoted 18 lines
drivers/net/virtio_net.c +14
-0+return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 3108
Quoted 7 lines
drivers/net/virtio_net.c +1
-0@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ; + dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);
Is there a way to make this tuneable from ethtool?
Quoted 10 lines
drivers/net/virtio_net.c +1
-0@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) ||Signature · 1 line
2.17.1
Hi Michael,
Em sex., 22 de nov. de 2019 às 07:31, Michael S. Tsirkin <[email protected]> escreveu:
Quoted 99 lines · Julio Faracco
Quoted 84 lines
Driver
virtio_netis not handling error events for TX provided bydev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.This commit brings back
virtnet_resetmethod to recover TX queues from a error state. That function is called byschedule_workmethod and it puts the reset function into work queue.As the error cause is unknown at this moment, it would be better to reset all queues.
Signed-off-by Julio Faracco <[email protected]>Signed-off-by Daiane Mendes <[email protected]>Cc Jason Wang <[email protected]>---
v1-v2: Tagnet-nextwas included to indentify where patch would be applied.--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +11
-1@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev);drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2600
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name);What does this mean?
Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2610
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + }Can we make the warning less cryptic?
I wonder why don't we get the sq from timeout directly? Would seem cleaner.
I need your help with debbuging information. What kind of field shoud it notify when a TX timeout occurs?
Or we can keep the default WARN_ONCE, but we need a minimum method implemented. We cannot get timeout directly because it needs to be implemented to get it directly.
Net core scheduler checks if this handler was implemented to throw a TX timeout. See:
void __netdev_watchdog_up(struct net_device *dev)
{
if (dev->netdev_ops->ndo_tx_timeout) {
if (dev->watchdog_timeo <= 0)
dev->watchdog_timeo = 5*HZ;
if (!mod_timer(&dev->watchdog_timer,
round_jiffies(jiffies + dev->watchdog_timeo)))
dev_hold(dev);
}
}Quoted 57 lines
Quoted 57 lines
drivers/net/virtio_net.c +42
-0+ +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; + + ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs);
Quoted 8 lines
drivers/net/virtio_net.c static int virtnet_validate(struct virtio_device *vdev) · line 3061
Quoted 5 lines
drivers/net/virtio_net.c +5
-0+if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev);Is this enough? E.g. all RX mode programming has been lost.
IMHO virtio net has a nice performance. You can take days to see a TX timeout. If it is happening frequently, there is something wrong with device. So, again, IMHO I don't think it would be too problematic.
Quoted 24 lines
Quoted 24 lines
drivers/net/virtio_net.c +14
-0+return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ;
Quoted 6 lines
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 3108
Quoted 4 lines
drivers/net/virtio_net.c +1
-0+ dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);Is there a way to make this tuneable from ethtool?
Yes and no.
You can do that obviously, but it is not a common field to tun. If you compare with other drivers.
Quoted 4 lines
Quoted 4 lines
drivers/net/virtio_net.c +0
-0@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;
Quoted 8 lines
Quoted 7 lines
drivers/net/virtio_net.c +1
-1INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || --2.17.1
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Hi Michael,
Em sex., 22 de nov. de 2019 às 07:31, Michael S. Tsirkin <[email protected]> escreveu:
Quoted 99 lines · Julio Faracco
Quoted 84 lines
Driver
virtio_netis not handling error events for TX provided bydev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.This commit brings back
virtnet_resetmethod to recover TX queues from a error state. That function is called byschedule_workmethod and it puts the reset function into work queue.As the error cause is unknown at this moment, it would be better to reset all queues.
Signed-off-by Julio Faracco <[email protected]>Signed-off-by Daiane Mendes <[email protected]>Cc Jason Wang <[email protected]>---
v1-v2: Tagnet-nextwas included to indentify where patch would be applied.--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +11
-1@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev);drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2600
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name);What does this mean?
Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2610
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + }Can we make the warning less cryptic?
I wonder why don't we get the sq from timeout directly? Would seem cleaner.
I need your help with debbuging information. What kind of field shoud it notify when a TX timeout occurs?
Or we can keep the default WARN_ONCE, but we need a minimum method implemented. We cannot get timeout directly because it needs to be implemented to get it directly.
Net core scheduler checks if this handler was implemented to throw a TX timeout. See:
void __netdev_watchdog_up(struct net_device *dev)
{
if (dev->netdev_ops->ndo_tx_timeout) {
if (dev->watchdog_timeo <= 0)
dev->watchdog_timeo = 5*HZ;
if (!mod_timer(&dev->watchdog_timer,
round_jiffies(jiffies + dev->watchdog_timeo)))
dev_hold(dev);
}
}Quoted 57 lines
Quoted 57 lines
drivers/net/virtio_net.c +42
-0+ +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; + + ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs);
Quoted 8 lines
drivers/net/virtio_net.c static int virtnet_validate(struct virtio_device *vdev) · line 3061
Quoted 5 lines
drivers/net/virtio_net.c +5
-0+if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev);Is this enough? E.g. all RX mode programming has been lost.
IMHO virtio net has a nice performance. You can take days to see a TX timeout. If it is happening frequently, there is something wrong with device. So, again, IMHO I don't think it would be too problematic.
Quoted 24 lines
Quoted 24 lines
drivers/net/virtio_net.c +14
-0+return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ;
Quoted 6 lines
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 3108
Quoted 4 lines
drivers/net/virtio_net.c +1
-0+ dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);Is there a way to make this tuneable from ethtool?
Yes and no.
You can do that obviously, but it is not a common field to tun. If you compare with other drivers.
Quoted 12 lines
Quoted 11 lines
drivers/net/virtio_net.c +1
-1@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || --2.17.1
Michael S. Tsirkin
maintainerQuoted 118 lines · Julio Faracco
Hi Michael,
Em sex., 22 de nov. de 2019 às 07:31, Michael S. Tsirkin <[email protected]> escreveu:
Quoted 99 lines · Julio Faracco
Quoted 84 lines
Driver
virtio_netis not handling error events for TX provided bydev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.This commit brings back
virtnet_resetmethod to recover TX queues from a error state. That function is called byschedule_workmethod and it puts the reset function into work queue.As the error cause is unknown at this moment, it would be better to reset all queues.
Signed-off-by Julio Faracco <[email protected]>Signed-off-by Daiane Mendes <[email protected]>Cc Jason Wang <[email protected]>---
v1-v2: Tagnet-nextwas included to indentify where patch would be applied.--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +11
-1@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev);drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2600
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name);What does this mean?
Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2610
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + }Can we make the warning less cryptic?
I wonder why don't we get the sq from timeout directly? Would seem cleaner.
Quoted 2 lines
I need your help with debbuging information. What kind of field shoud it notify when a TX timeout occurs?
I am just saying this: why don't we add a "txqueue" parameter to ndo_tx_timeout? It's not hard - just need to be careful to fix all callers. I got the list of files and functions by grepping for ndo_tx_timeout. The massaged it with the following script.
#/usr/bin/perl
use strict;
use warnings;
our $^I = '.bak';
my @work = (
["arch/m68k/emu/nfeth.c", "nfeth_tx_timeout"],
["arch/um/drivers/net_kern.c", "uml_net_tx_timeout"],
["arch/um/drivers/vector_kern.c", "vector_net_tx_timeout"],
["arch/xtensa/platforms/iss/network.c", "iss_net_tx_timeout"], ["drivers/char/pcmcia/synclink_cs.c", "hdlcdev_tx_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"],
["drivers/message/fusion/mptlan.c", "mpt_lan_tx_timeout"],
["drivers/misc/sgi-xp/xpnet.c", "xpnet_dev_tx_timeout"],
["drivers/net/appletalk/cops.c", "cops_timeout"],
["drivers/net/arcnet/arcnet.c", "arcnet_timeout"],
["drivers/net/arcnet/com20020.c", "arcnet_timeout"],
["drivers/net/ethernet/3com/3c509.c", "el3_tx_timeout"],
["drivers/net/ethernet/3com/3c515.c", "corkscrew_timeout"], ["drivers/net/ethernet/3com/3c574_cs.c", "el3_tx_timeout"], ["drivers/net/ethernet/3com/3c589_cs.c", "el3_tx_timeout"],
["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"],
["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"],
["drivers/net/ethernet/3com/typhoon.c", "typhoon_tx_timeout"],
["drivers/net/ethernet/8390/8390.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/8390p.c", "eip_tx_timeout"],
["drivers/net/ethernet/8390/ax88796.c", "ax_ei_tx_timeout"], ["drivers/net/ethernet/8390/axnet_cs.c", "axnet_tx_timeout"], ["drivers/net/ethernet/8390/etherh.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/hydra.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/mac8390.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/mcf8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/ne2k-pci.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/pcnet_cs.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/smc-ultra.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/wd.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/zorro8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/adaptec/starfire.c", "tx_timeout"],
["drivers/net/ethernet/agere/et131x.c", "et131x_tx_timeout"], ["drivers/net/ethernet/allwinner/sun4i-emac.c", "emac_timeout"], ["drivers/net/ethernet/alteon/acenic.c", "ace_watchdog"], ["drivers/net/ethernet/amazon/ena/ena_netdev.c", "ena_tx_timeout"], ["drivers/net/ethernet/amd/a2065.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/am79c961a.c", "am79c961_timeout"], ["drivers/net/ethernet/amd/amd8111e.c", "amd8111e_tx_timeout"], ["drivers/net/ethernet/amd/ariadne.c", "ariadne_tx_timeout"], ["drivers/net/ethernet/amd/atarilance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/au1000_eth.c", "au1000_tx_timeout"], ["drivers/net/ethernet/amd/declance.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/lance.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/mvme147.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/ni65.c", "ni65_timeout"],
["drivers/net/ethernet/amd/nmclan_cs.c", "mace_tx_timeout"],
["drivers/net/ethernet/amd/pcnet32.c", "pcnet32_tx_timeout"], ["drivers/net/ethernet/amd/sunlance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/xgbe/xgbe-drv.c", "xgbe_tx_timeout"], ["drivers/net/ethernet/apm/xgene-v2/main.c", "xge_timeout"], ["drivers/net/ethernet/apm/xgene/xgene_enet_main.c", "xgene_enet_timeout"], ["drivers/net/ethernet/apple/macmace.c", "mace_tx_timeout"], ["drivers/net/ethernet/atheros/ag71xx.c", "ag71xx_tx_timeout"], ["drivers/net/ethernet/atheros/alx/main.c", "alx_tx_timeout"], ["drivers/net/ethernet/atheros/atl1c/atl1c_main.c", "atl1c_tx_timeout"], ["drivers/net/ethernet/atheros/atl1e/atl1e_main.c", "atl1e_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl1.c", "atlx_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl2.c", "atl2_tx_timeout"], ["drivers/net/ethernet/broadcom/b44.c", "b44_tx_timeout"], ["drivers/net/ethernet/broadcom/bcmsysport.c", "bcm_sysport_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2.c", "bnx2_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c", "bnx2x_tx_timeout"], ["drivers/net/ethernet/broadcom/bnxt/bnxt.c", "bnxt_tx_timeout"], ["drivers/net/ethernet/broadcom/genet/bcmgenet.c", "bcmgenet_timeout"], ["drivers/net/ethernet/broadcom/sb1250-mac.c", "sbmac_tx_timeout"], ["drivers/net/ethernet/broadcom/tg3.c", "tg3_tx_timeout"],
["drivers/net/ethernet/calxeda/xgmac.c", "xgmac_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c", "lio_vf_rep_tx_timeout"], ["drivers/net/ethernet/cavium/thunder/nicvf_main.c", "nicvf_tx_timeout"], ["drivers/net/ethernet/cirrus/cs89x0.c", "net_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cortina/gemini.c", "gmac_tx_timeout"], ["drivers/net/ethernet/davicom/dm9000.c", "dm9000_timeout"], ["drivers/net/ethernet/dec/tulip/de2104x.c", "de_tx_timeout"], ["drivers/net/ethernet/dec/tulip/tulip_core.c", "tulip_tx_timeout"], ["drivers/net/ethernet/dec/tulip/winbond-840.c", "tx_timeout"], ["drivers/net/ethernet/dlink/dl2k.c", "rio_tx_timeout"],
["drivers/net/ethernet/dlink/sundance.c", "tx_timeout"], ["drivers/net/ethernet/emulex/benet/be_main.c", "be_tx_timeout"],
["drivers/net/ethernet/ethoc.c", "ethoc_tx_timeout"],
["drivers/net/ethernet/faraday/ftgmac100.c", "ftgmac100_tx_timeout"], ["drivers/net/ethernet/fealnx.c", "fealnx_tx_timeout"], ["drivers/net/ethernet/freescale/dpaa/dpaa_eth.c", "dpaa_tx_timeout"], ["drivers/net/ethernet/freescale/fec_main.c", "fec_timeout"], ["drivers/net/ethernet/freescale/fec_mpc52xx.c", "mpc52xx_fec_tx_timeout"], ["drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c", "fs_timeout"], ["drivers/net/ethernet/freescale/gianfar.c", "gfar_timeout"], ["drivers/net/ethernet/freescale/ucc_geth.c", "ucc_geth_timeout"], ["drivers/net/ethernet/fujitsu/fmvj18x_cs.c", "fjn_tx_timeout"], ["drivers/net/ethernet/google/gve/gve_main.c", "gve_tx_timeout"], ["drivers/net/ethernet/hisilicon/hip04_eth.c", "hip04_timeout"], ["drivers/net/ethernet/hisilicon/hix5hd2_gmac.c", "hix5hd2_net_timeout"], ["drivers/net/ethernet/hisilicon/hns/hns_enet.c", "hns_nic_net_timeout"], ["drivers/net/ethernet/hisilicon/hns3/hns3_enet.c", "hns3_nic_net_timeout"], ["drivers/net/ethernet/huawei/hinic/hinic_main.c", "hinic_tx_timeout"], ["drivers/net/ethernet/i825xx/82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/ether1.c", "ether1_timeout"], ["drivers/net/ethernet/i825xx/lib82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/sun3_82586.c", "sun3_82586_timeout"], ["drivers/net/ethernet/ibm/ehea/ehea_main.c", "ehea_tx_watchdog"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"],
["drivers/net/ethernet/ibm/ibmvnic.c", "ibmvnic_tx_timeout"],
["drivers/net/ethernet/intel/e100.c", "e100_tx_timeout"], ["drivers/net/ethernet/intel/e1000/e1000_main.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/e1000e/netdev.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/fm10k/fm10k_netdev.c", "fm10k_tx_timeout"], ["drivers/net/ethernet/intel/i40e/i40e_main.c", "i40e_tx_timeout"], ["drivers/net/ethernet/intel/iavf/iavf_main.c", "iavf_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/igb/igb_main.c", "igb_tx_timeout"], ["drivers/net/ethernet/intel/igbvf/netdev.c", "igbvf_tx_timeout"], ["drivers/net/ethernet/intel/ixgb/ixgb_main.c", "ixgb_tx_timeout"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c", "adapter->netdev->netdev_ops->ndo_tx_timeout(adapter->netdev);"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_main.c", "ixgbe_tx_timeout"], ["drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c", "ixgbevf_tx_timeout"], ["drivers/net/ethernet/jme.c", "jme_tx_timeout"],
["drivers/net/ethernet/korina.c", "korina_tx_timeout"],
["drivers/net/ethernet/lantiq_etop.c", "ltq_etop_tx_timeout"], ["drivers/net/ethernet/marvell/mv643xx_eth.c", "mv643xx_eth_tx_timeout"], ["drivers/net/ethernet/marvell/pxa168_eth.c", "pxa168_eth_tx_timeout"], ["drivers/net/ethernet/marvell/skge.c", "skge_tx_timeout"],
["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"],
["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"], ["drivers/net/ethernet/mediatek/mtk_eth_soc.c", "mtk_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx5/core/en_main.c", "mlx5e_tx_timeout"], ["drivers/net/ethernet/micrel/ks8842.c", "ks8842_tx_timeout"], ["drivers/net/ethernet/micrel/ksz884x.c", "netdev_tx_timeout"], ["drivers/net/ethernet/microchip/enc28j60.c", "enc28j60_tx_timeout"], ["drivers/net/ethernet/microchip/encx24j600.c", "encx24j600_tx_timeout"], ["drivers/net/ethernet/natsemi/jazzsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/macsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/natsemi.c", "ns_tx_timeout"], ["drivers/net/ethernet/natsemi/ns83820.c", "ns83820_tx_timeout"], ["drivers/net/ethernet/natsemi/xtsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/neterion/s2io.c", "s2io_tx_watchdog"], ["drivers/net/ethernet/neterion/vxge/vxge-main.c", "vxge_tx_watchdog"], ["drivers/net/ethernet/netronome/nfp/nfp_net_common.c", "nfp_net_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c", "pch_gbe_tx_timeout"], ["drivers/net/ethernet/packetengines/hamachi.c", "hamachi_tx_timeout"], ["drivers/net/ethernet/packetengines/yellowfin.c", "yellowfin_tx_timeout"], ["drivers/net/ethernet/pensando/ionic/ionic_lif.c", "ionic_tx_timeout"], ["drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c", "netxen_tx_timeout"], ["drivers/net/ethernet/qlogic/qla3xxx.c", "ql3xxx_tx_timeout"], ["drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c", "qlcnic_tx_timeout"], ["drivers/net/ethernet/qualcomm/emac/emac.c", "emac_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_spi.c", "qcaspi_netdev_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_uart.c", "qcauart_netdev_tx_timeout"], ["drivers/net/ethernet/rdc/r6040.c", "r6040_tx_timeout"],
["drivers/net/ethernet/realtek/8139cp.c", "cp_tx_timeout"], ["drivers/net/ethernet/realtek/8139too.c", "rtl8139_tx_timeout"], ["drivers/net/ethernet/realtek/atp.c", "tx_timeout"],
["drivers/net/ethernet/realtek/r8169_main.c", "rtl8169_tx_timeout"], ["drivers/net/ethernet/renesas/ravb_main.c", "ravb_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c", "sxgbe_tx_timeout"], ["drivers/net/ethernet/seeq/ether3.c", "ether3_timeout"],
["drivers/net/ethernet/seeq/sgiseeq.c", "timeout"],
["drivers/net/ethernet/sfc/efx.c", "efx_watchdog"],
["drivers/net/ethernet/sfc/falcon/efx.c", "ef4_watchdog"],
["drivers/net/ethernet/sgi/ioc3-eth.c", "ioc3_timeout"],
["drivers/net/ethernet/sgi/meth.c", "meth_tx_timeout"],
["drivers/net/ethernet/silan/sc92031.c", "sc92031_tx_timeout"], ["drivers/net/ethernet/sis/sis190.c", "sis190_tx_timeout"],
["drivers/net/ethernet/sis/sis900.c", "sis900_tx_timeout"],
["drivers/net/ethernet/smsc/epic100.c", "epic_tx_timeout"],
["drivers/net/ethernet/smsc/smc911x.c", "smc911x_timeout"],
["drivers/net/ethernet/smsc/smc9194.c", "smc_timeout"],
["drivers/net/ethernet/smsc/smc91c92_cs.c", "smc_tx_timeout"], ["drivers/net/ethernet/smsc/smc91x.c", "smc_timeout"], ["drivers/net/ethernet/stmicro/stmmac/stmmac_main.c", "stmmac_tx_timeout"], ["drivers/net/ethernet/sun/cassini.c", "cas_tx_timeout"],
["drivers/net/ethernet/sun/ldmvsw.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/sun/niu.c", "niu_tx_timeout"],
["drivers/net/ethernet/sun/sunbmac.c", "bigmac_tx_timeout"],
["drivers/net/ethernet/sun/sungem.c", "gem_tx_timeout"],
["drivers/net/ethernet/sun/sunhme.c", "happy_meal_tx_timeout"], ["drivers/net/ethernet/sun/sunqe.c", "qe_tx_timeout"],
["drivers/net/ethernet/sun/sunvnet.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/synopsys/dwc-xlgmac-net.c", "xlgmac_tx_timeout"], ["drivers/net/ethernet/ti/cpmac.c", "cpmac_tx_timeout"],
["drivers/net/ethernet/ti/cpsw.c", "cpsw_ndo_tx_timeout"], ["drivers/net/ethernet/ti/davinci_emac.c", "emac_dev_tx_timeout"], ["drivers/net/ethernet/ti/netcp_core.c", "netcp_ndo_tx_timeout"], ["drivers/net/ethernet/ti/tlan.c", "tlan_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_net.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_wireless.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/spider_net.c", "spider_net_tx_timeout"], ["drivers/net/ethernet/toshiba/tc35815.c", "tc35815_tx_timeout"], ["drivers/net/ethernet/via/via-rhine.c", "rhine_tx_timeout"], ["drivers/net/ethernet/wiznet/w5100.c", "w5100_tx_timeout"], ["drivers/net/ethernet/wiznet/w5300.c", "w5300_tx_timeout"], ["drivers/net/ethernet/xilinx/xilinx_emaclite.c", "xemaclite_tx_timeout"], ["drivers/net/ethernet/xircom/xirc2ps_cs.c", "xirc_tx_timeout"],
["drivers/net/fjes/fjes_main.c", "fjes_tx_retry"],
["drivers/net/slip/slip.c", "sl_tx_timeout"],
["drivers/net/usb/aqc111.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/ax88172a.c", "usbnet_tx_timeout"],
["drivers/net/usb/ax88179_178a.c", "usbnet_tx_timeout"],
["drivers/net/usb/catc.c", "catc_tx_timeout"],
["drivers/net/usb/cdc_mbim.c", "usbnet_tx_timeout"],
["drivers/net/usb/cdc_ncm.c", "usbnet_tx_timeout"],
["drivers/net/usb/dm9601.c", "usbnet_tx_timeout"],
["drivers/net/usb/hso.c", "hso_net_tx_timeout"],
["drivers/net/usb/int51x1.c", "usbnet_tx_timeout"],
["drivers/net/usb/ipheth.c", "ipheth_tx_timeout"],
["drivers/net/usb/kaweth.c", "kaweth_tx_timeout"],
["drivers/net/usb/lan78xx.c", "lan78xx_tx_timeout"],
["drivers/net/usb/mcs7830.c", "usbnet_tx_timeout"],
["drivers/net/usb/pegasus.c", "pegasus_tx_timeout"],
["drivers/net/usb/qmi_wwan.c", "usbnet_tx_timeout"],
["drivers/net/usb/r8152.c", "rtl8152_tx_timeout"],
["drivers/net/usb/rndis_host.c", "usbnet_tx_timeout"],
["drivers/net/usb/rtl8150.c", "rtl8150_tx_timeout"],
["drivers/net/usb/sierra_net.c", "usbnet_tx_timeout"],
["drivers/net/usb/smsc75xx.c", "usbnet_tx_timeout"],
["drivers/net/usb/smsc95xx.c", "usbnet_tx_timeout"],
["drivers/net/usb/sr9700.c", "usbnet_tx_timeout"],
["drivers/net/usb/sr9800.c", "usbnet_tx_timeout"],
["drivers/net/usb/usbnet.c", "usbnet_tx_timeout"],
["drivers/net/vmxnet3/vmxnet3_drv.c", "vmxnet3_tx_timeout"],
["drivers/net/wan/cosa.c", "cosa_net_timeout"],
["drivers/net/wan/farsync.c", "fst_tx_timeout"],
["drivers/net/wan/fsl_ucc_hdlc.c", "uhdlc_tx_timeout"],
["drivers/net/wan/lmc/lmc_main.c", "lmc_driver_timeout"],
["drivers/net/wan/x25_asy.c", "x25_asy_timeout"],
["drivers/net/wimax/i2400m/netdev.c", "i2400m_tx_timeout"], ["drivers/net/wireless/intel/ipw2x00/ipw2100.c", "ipw2100_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/main.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/orinoco_usb.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/prism54/islpci_dev.c", "islpci_eth_tx_timeout"], ["drivers/net/wireless/marvell/mwifiex/main.c", "mwifiex_tx_timeout"], ["drivers/net/wireless/quantenna/qtnfmac/core.c", "qtnf_netdev_tx_timeout"], ["drivers/net/wireless/rndis_wlan.c", "usbnet_tx_timeout"],
["drivers/net/wireless/wl3501_cs.c", "wl3501_tx_timeout"],
["drivers/net/wireless/zydas/zd1201.c", "zd1201_tx_timeout"],
["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"],
["drivers/staging/ks7010/ks_wlan_net.c", "ks_wlan_tx_timeout"], ["drivers/staging/qlge/qlge_main.c", "qlge_tx_timeout"], ["drivers/staging/rtl8192e/rtl8192e/rtl_core.c", "_rtl92e_tx_timeout"], ["drivers/staging/rtl8192u/r8192U_core.c", "tx_timeout"], ["drivers/staging/unisys/visornic/visornic_main.c", "visornic_xmit_timeout"], ["drivers/staging/wlan-ng/p80211netdev.c", "p80211knetdev_tx_timeout"],
["drivers/tty/n_gsm.c", "gsm_mux_net_tx_timeout"],
["drivers/tty/synclink.c", "hdlcdev_tx_timeout"],
["drivers/tty/synclink_gt.c", "hdlcdev_tx_timeout"],
["drivers/tty/synclinkmp.c", "hdlcdev_tx_timeout"],
["net/atm/lec.c", "lec_tx_timeout"],
["net/bluetooth/bnep/netdev.c", "bnep_net_timeout"]
);
for my $p (@work) {
my @pair = @$p;
my $file = $pair[0];
my $func = $pair[1];
print STDERR $file , ": ", $func,"\n";
our @ARGV = ($file);
while (<ARGV>) {
if (m/($func\(struct\s+net_device\s+\*[A-Za-z_][A-Za-z-0-9]*)(\))/) {
print STDERR "found $1+$2 in $file\n";
}
if (s/($func\(struct\s+net_device\s+\*[A-Za-z_][A-Za-z-0-9]*)(\))/$1, int txqueue$2/) {
print STDERR "$func found in $file\n";
}
print;
}
}Result is at the bottom. If you like this approach, feel free to include as the 1st patch in your series.
Quoted 83 lines
Or we can keep the default
WARN_ONCE, but we need a minimum method implemented. We cannot get timeout directly because it needs to be implemented to get it directly.
Net core scheduler checks if this handler was implemented to throw a TX timeout. See:void __netdev_watchdog_up(struct net_device *dev) { if (dev->netdev_ops->ndo_tx_timeout) { if (dev->watchdog_timeo <= 0) dev->watchdog_timeo = 5*HZ; if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + dev->watchdog_timeo))) dev_hold(dev); } }Quoted 57 lines
Quoted 57 lines
drivers/net/virtio_net.c +42
-0+ +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; + + ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs);Quoted 8 lines
drivers/net/virtio_net.c static int virtnet_validate(struct virtio_device *vdev) · line 3061
Quoted 5 lines
drivers/net/virtio_net.c +5
-0+if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev);Is this enough? E.g. all RX mode programming has been lost.
Quoted 2 lines
IMHO virtio net has a nice performance. You can take days to see a TX timeout. If it is happening frequently, there is something wrong with device.
It is rather easy if you attach a debugger to qemu though ;)
Quoted 33 lines
So, again, IMHO I don't think it would be too problematic.
Quoted 24 lines
Quoted 24 lines
drivers/net/virtio_net.c +14
-0+return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ;Quoted 6 lines
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 3108
Quoted 4 lines
drivers/net/virtio_net.c +1
-0+ dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);Is there a way to make this tuneable from ethtool?
Quoted 3 lines
Yes and no.
You can do that obviously, but it is not a common field to tun. If you compare with other drivers.
Maybe we should just add a field specifying the timeout from the host. I'll ponder this over the weekend.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/virtio_net.c +1
-1@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || --2.17.1
--->
netdev: pass the stuck queue to the timeout handler
This allows incrementing the correct timeout statistic without any mess. Down the road, devices can learn to reset just the specific queue.
---
Warning: untested.
arch/m68k/emu/nfeth.c +1 -1
@@ -167,7 +167,7 @@ static int nfeth_xmit(struct sk_buff *skb, struct net_device *dev)return 0 ; } -static void nfeth_tx_timeout (struct net_device *dev) +static void nfeth_tx_timeout (struct net_device *dev,int txqueue) { dev->stats.tx_errors++;netif_wake_queue (dev);
arch/um/drivers/net_kern.c +1 -1
@@ -247,7 +247,7 @@ static void uml_net_set_multicast_list(struct net_device *dev)return ; } -static void uml_net_tx_timeout (struct net_device *dev) +static void uml_net_tx_timeout (struct net_device *dev,int txqueue) {netif_trans_update (dev);netif_wake_queue (dev);
arch/um/drivers/vector_kern.c +1 -1
@@ -1298,7 +1298,7 @@ static void vector_net_set_multicast_list(struct net_device *dev)return ; } -static void vector_net_tx_timeout (struct net_device *dev) +static void vector_net_tx_timeout (struct net_device *dev,int txqueue) {struct vector_private *vp =netdev_priv (dev);
arch/xtensa/platforms/iss/network.c +1 -1
@@ -455,7 +455,7 @@ static void iss_net_set_multicast_list(struct net_device *dev) { } -static void iss_net_tx_timeout (struct net_device *dev) +static void iss_net_tx_timeout (struct net_device *dev,int txqueue) { }
drivers/char/pcmcia/synclink_cs.c +1 -1
@@ -4169,7 +4169,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {MGSLPC_INFO *info =dev_to_port (dev);unsigned long flags;
drivers/infiniband/ulp/ipoib/ipoib_main.c +1 -1
@@ -1182,7 +1182,7 @@ static netdev_tx_t ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void ipoib_timeout (struct net_device *dev) +static void ipoib_timeout (struct net_device *dev,int txqueue) {struct ipoib_dev_priv *priv =ipoib_priv (dev);
drivers/message/fusion/mptlan.c +1 -1
@@ -552,7 +552,7 @@ mpt_lan_close(struct net_device *dev)/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* Tx timeout handler. */ static void -mpt_lan_tx_timeout (struct net_device *dev) +mpt_lan_tx_timeout (struct net_device *dev,int txqueue) {struct mpt_lan_priv *priv =netdev_priv (dev);MPT_ADAPTER *mpt_dev = priv->mpt_dev;
drivers/misc/sgi-xp/xpnet.c +1 -1
@@ -496,7 +496,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)* Deal with transmit timeouts coming from the network layer. */ static void -xpnet_dev_tx_timeout (struct net_device *dev) +xpnet_dev_tx_timeout (struct net_device *dev,int txqueue) { dev->stats.tx_errors++; }
drivers/net/appletalk/cops.c +2 -2
@@ -189,7 +189,7 @@ static int cops_nodeid (struct net_device *dev, int nodeid);static irqreturn_t cops_interrupt (int irq,void *dev_id);static void cops_poll (struct timer_list *t); -static void cops_timeout (struct net_device *dev); +static void cops_timeout (struct net_device *dev,int txqueue);static void cops_rx (struct net_device *dev);static netdev_tx_t cops_send_packet (struct sk_buff *skb,struct net_device *dev);
@@ -844,7 +844,7 @@ static void cops_rx(struct net_device *dev)netif_rx (skb); } -static void cops_timeout (struct net_device *dev) +static void cops_timeout (struct net_device *dev,int txqueue) {struct cops_local *lp =netdev_priv (dev);int ioaddr = dev->base_addr;
drivers/net/arcnet/arcnet.c +1 -1
@@ -763,7 +763,7 @@ static int go_tx(struct net_device *dev) }/* Called by the kernel when transmit times out */ -void arcnet_timeout (struct net_device *dev) +void arcnet_timeout (struct net_device *dev,int txqueue) {unsigned long flags;struct arcnet_local *lp =netdev_priv (dev);
drivers/net/ethernet/3com/3c515.c +2 -2
@@ -371,7 +371,7 @@ static void corkscrew_timer(struct timer_list *t);static netdev_tx_t corkscrew_start_xmit (struct sk_buff *skb,struct net_device *dev);static int corkscrew_rx (struct net_device *dev); -static void corkscrew_timeout (struct net_device *dev); +static void corkscrew_timeout (struct net_device *dev,int txqueue);static int boomerang_rx (struct net_device *dev);static irqreturn_t corkscrew_interrupt (int irq,void *dev_id);static int corkscrew_close (struct net_device *dev);
@@ -961,7 +961,7 @@ static void corkscrew_timer(struct timer_list *t)#endif /* AUTOMEDIA */ } -static void corkscrew_timeout (struct net_device *dev) +static void corkscrew_timeout (struct net_device *dev,int txqueue) {int i;struct corkscrew_private *vp =netdev_priv (dev);
drivers/net/ethernet/3com/3c574_cs.c +2 -2
@@ -234,7 +234,7 @@ static void update_stats(struct net_device *dev);static struct net_device_stats *el3_get_stats (struct net_device *dev);static int el3_rx (struct net_device *dev,int worklimit);static int el3_close (struct net_device *dev); -static void el3_tx_timeout (struct net_device *dev); +static void el3_tx_timeout (struct net_device *dev,int txqueue);static int el3_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void set_rx_mode (struct net_device *dev);static void set_multicast_list (struct net_device *dev);
@@ -690,7 +690,7 @@ static int el3_open(struct net_device *dev)return 0 ; } -static void el3_tx_timeout (struct net_device *dev) +static void el3_tx_timeout (struct net_device *dev,int txqueue) {unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/3com/3c589_cs.c +2 -2
@@ -173,7 +173,7 @@ static void update_stats(struct net_device *dev);static struct net_device_stats *el3_get_stats (struct net_device *dev);static int el3_rx (struct net_device *dev);static int el3_close (struct net_device *dev); -static void el3_tx_timeout (struct net_device *dev); +static void el3_tx_timeout (struct net_device *dev,int txqueue);static void set_rx_mode (struct net_device *dev);static void set_multicast_list (struct net_device *dev);static const struct ethtool_ops netdev_ethtool_ops;
@@ -526,7 +526,7 @@ static int el3_open(struct net_device *dev)return 0 ; } -static void el3_tx_timeout (struct net_device *dev) +static void el3_tx_timeout (struct net_device *dev,int txqueue) {unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/3com/3c59x.c +2 -2
@@ -776,7 +776,7 @@ static void set_rx_mode(struct net_device *dev);#ifdef CONFIG_PCI static int vortex_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);#endif -static void vortex_tx_timeout (struct net_device *dev); +static void vortex_tx_timeout (struct net_device *dev,int txqueue);static void acpi_set_WOL (struct net_device *dev);static const struct ethtool_ops vortex_ethtool_ops;static void set_8021q_mode (struct net_device *dev,int enable);
@@ -1877,7 +1877,7 @@ vortex_timer(struct timer_list *t)iowrite16 (FakeIntr, ioaddr +EL3_CMD ); } -static void vortex_tx_timeout (struct net_device *dev) +static void vortex_tx_timeout (struct net_device *dev,int txqueue) {struct vortex_private *vp =netdev_priv (dev);void __iomem *ioaddr = vp->ioaddr;
drivers/net/ethernet/3com/typhoon.c +1 -1
@@ -2013,7 +2013,7 @@ typhoon_stop_runtime(struct typhoon *tp, int wait_type) }static void -typhoon_tx_timeout (struct net_device *dev) +typhoon_tx_timeout (struct net_device *dev,int txqueue) {struct typhoon *tp =netdev_priv (dev);
drivers/net/ethernet/8390/8390.c +1 -1
@@ -36,7 +36,7 @@ void ei_set_multicast_list(struct net_device *dev) }EXPORT_SYMBOL (ei_set_multicast_list); -void ei_tx_timeout (struct net_device *dev) +void ei_tx_timeout (struct net_device *dev,int txqueue) {__ei_tx_timeout (dev); }
drivers/net/ethernet/8390/8390p.c +1 -1
@@ -41,7 +41,7 @@ void eip_set_multicast_list(struct net_device *dev) }EXPORT_SYMBOL (eip_set_multicast_list); -void eip_tx_timeout (struct net_device *dev) +void eip_tx_timeout (struct net_device *dev,int txqueue) {__ei_tx_timeout (dev); }
drivers/net/ethernet/8390/axnet_cs.c +2 -2
@@ -83,7 +83,7 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb, struct net_device *dev);static struct net_device_stats *get_stats (struct net_device *dev);static void set_multicast_list (struct net_device *dev); -static void axnet_tx_timeout (struct net_device *dev); +static void axnet_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t ei_irq_wrapper (int irq,void *dev_id);static void ei_watchdog (struct timer_list *t);static void axnet_reset_8390 (struct net_device *dev);
@@ -903,7 +903,7 @@ static int ax_close(struct net_device *dev)* completed (or failed) - i.e. never posted a Tx related interrupt. */ -static void axnet_tx_timeout (struct net_device *dev) +static void axnet_tx_timeout (struct net_device *dev,int txqueue) {long e8390_base = dev->base_addr;struct ei_device *ei_local =netdev_priv (dev);
drivers/net/ethernet/adaptec/starfire.c +2 -2
@@ -576,7 +576,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);static void mdio_write (struct net_device *dev,int phy_id,int location,int value);static int netdev_open (struct net_device *dev);static void check_duplex (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t intr_handler (int irq,void *dev_instance);
@@ -1105,7 +1105,7 @@ static void check_duplex(struct net_device *dev) } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base;
drivers/net/ethernet/agere/et131x.c +1 -1
@@ -3811,7 +3811,7 @@ static netdev_tx_t et131x_tx(struct sk_buff *skb, struct net_device *netdev)* specified by the 'tx_timeo" element in the net_device structure (see * et131x_alloc_device() to see how this value is set). */ -static void et131x_tx_timeout (struct net_device *netdev) +static void et131x_tx_timeout (struct net_device *netdev,int txqueue) {struct et131x_adapter *adapter =netdev_priv (netdev);struct tx_ring *tx_ring = &adapter->tx_ring;
drivers/net/ethernet/allwinner/sun4i-emac.c +1 -1
@@ -407,7 +407,7 @@ static void emac_init_device(struct net_device *dev) }/* Our watchdog timed out. Called by the networking layer */ -static void emac_timeout (struct net_device *dev) +static void emac_timeout (struct net_device *dev,int txqueue) {struct emac_board_info *db =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/alteon/acenic.c +2 -2
@@ -437,7 +437,7 @@ static const struct ethtool_ops ace_ethtool_ops = { .set_link_ksettings = ace_set_link_ksettings, }; -static void ace_watchdog (struct net_device *dev); +static void ace_watchdog (struct net_device *dev,int txqueue);static const struct net_device_ops ace_netdev_ops = { .ndo_open = ace_open,
@@ -1542,7 +1542,7 @@ static void ace_set_rxtx_parms(struct net_device *dev, int jumbo) } -static void ace_watchdog (struct net_device *data) +static void ace_watchdog (struct net_device *data,int txqueue) {struct net_device *dev = data;struct ace_private *ap =netdev_priv (dev);
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
@@ -78,7 +78,7 @@ static void check_for_admin_com_state(struct ena_adapter *adapter);static void ena_destroy_device (struct ena_adapter *adapter,bool graceful);static int ena_restore_device (struct ena_adapter *adapter); -static void ena_tx_timeout (struct net_device *dev) +static void ena_tx_timeout (struct net_device *dev,int txqueue) {struct ena_adapter *adapter =netdev_priv (dev);
drivers/net/ethernet/amd/a2065.c +1 -1
@@ -522,7 +522,7 @@ static inline int lance_reset(struct net_device *dev)return status; } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
drivers/net/ethernet/amd/am79c961a.c +1 -1
@@ -422,7 +422,7 @@ static void am79c961_setmulticastlist (struct net_device *dev)spin_unlock_irqrestore (&priv->chip_lock, flags); } -static void am79c961_timeout (struct net_device *dev) +static void am79c961_timeout (struct net_device *dev,int txqueue) {printk (KERN_WARNING "%s: transmit timed out, network cable problem?\n" , dev->name);
drivers/net/ethernet/amd/amd8111e.c +1 -1
@@ -1569,7 +1569,7 @@ static int amd8111e_enable_link_change(struct amd8111e_priv *lp)* failed or the interface is locked up. This function will reinitialize * the hardware. */ -static void amd8111e_tx_timeout (struct net_device *dev) +static void amd8111e_tx_timeout (struct net_device *dev,int txqueue) {struct amd8111e_priv *lp =netdev_priv (dev);int err;
drivers/net/ethernet/amd/ariadne.c +1 -1
@@ -530,7 +530,7 @@ static inline void ariadne_reset(struct net_device *dev)netif_start_queue (dev); } -static void ariadne_tx_timeout (struct net_device *dev) +static void ariadne_tx_timeout (struct net_device *dev,int txqueue) {volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr;
drivers/net/ethernet/amd/au1000_eth.c +1 -1
@@ -1014,7 +1014,7 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)* The Tx ring has been full longer than the watchdog timeout * value. The transmitter must be hung? */ -static void au1000_tx_timeout (struct net_device *dev) +static void au1000_tx_timeout (struct net_device *dev,int txqueue) {netdev_err (dev,"au1000_tx_timeout: dev=%p\n" , dev);au1000_reset_mac (dev);
drivers/net/ethernet/amd/declance.c +1 -1
@@ -884,7 +884,7 @@ static inline int lance_reset(struct net_device *dev)return status; } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
drivers/net/ethernet/amd/ni65.c +2 -2
@@ -254,7 +254,7 @@ static int ni65_lance_reinit(struct net_device *dev);static void ni65_init_lance (struct priv *p,unsigned char *,int ,int );static netdev_tx_t ni65_send_packet (struct sk_buff *skb,struct net_device *dev); -static void ni65_timeout (struct net_device *dev); +static void ni65_timeout (struct net_device *dev,int txqueue);static int ni65_close (struct net_device *dev);static int ni65_alloc_buffer (struct net_device *dev);static void ni65_free_buffer (struct priv *p);
@@ -1133,7 +1133,7 @@ static void ni65_recv_intr(struct net_device *dev,int csr0)* kick xmitter .. */ -static void ni65_timeout (struct net_device *dev) +static void ni65_timeout (struct net_device *dev,int txqueue) {int i;struct priv *p = dev->ml_priv;
drivers/net/ethernet/amd/nmclan_cs.c +2 -2
@@ -407,7 +407,7 @@ static int mace_open(struct net_device *dev);static int mace_close (struct net_device *dev);static netdev_tx_t mace_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void mace_tx_timeout (struct net_device *dev); +static void mace_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t mace_interrupt (int irq,void *dev_id);static struct net_device_stats *mace_get_stats (struct net_device *dev);static int mace_rx (struct net_device *dev,unsigned char RxCnt);
@@ -837,7 +837,7 @@ mace_start_xmitfailed, put skb back into a list." ---------------------------------------------------------------------------- */ -static void mace_tx_timeout (struct net_device *dev) +static void mace_tx_timeout (struct net_device *dev,int txqueue) {mace_private *lp =netdev_priv (dev);struct pcmcia_device *link = lp->p_dev;
drivers/net/ethernet/amd/pcnet32.c +2 -2
@@ -314,7 +314,7 @@ static int pcnet32_open(struct net_device *);static int pcnet32_init_ring (struct net_device *);static netdev_tx_t pcnet32_start_xmit (struct sk_buff *,struct net_device *); -static void pcnet32_tx_timeout (struct net_device *dev); +static void pcnet32_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t pcnet32_interrupt (int ,void *);static int pcnet32_close (struct net_device *);static struct net_device_stats *pcnet32_get_stats (struct net_device *);
@@ -2455,7 +2455,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits) lp->a->write_csr (ioaddr,CSR0 , csr0_bits); } -static void pcnet32_tx_timeout (struct net_device *dev) +static void pcnet32_tx_timeout (struct net_device *dev,int txqueue) {struct pcnet32_private *lp =netdev_priv (dev);unsigned long ioaddr = dev->base_addr, flags;
drivers/net/ethernet/amd/sunlance.c +1 -1
@@ -1097,7 +1097,7 @@ static void lance_piozero(void __iomem *dest, int len)sbus_writeb (0 , piobuf); } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1 -1
@@ -2152,7 +2152,7 @@ static int xgbe_change_mtu(struct net_device *netdev, int mtu)return 0 ; } -static void xgbe_tx_timeout (struct net_device *netdev) +static void xgbe_tx_timeout (struct net_device *netdev,int txqueue) {struct xgbe_prv_data *pdata =netdev_priv (netdev);
drivers/net/ethernet/apm/xgene-v2/main.c +1 -1
@@ -575,7 +575,7 @@ static void xge_free_pending_skb(struct net_device *ndev) } } -static void xge_timeout (struct net_device *ndev) +static void xge_timeout (struct net_device *ndev,int txqueue) {struct xge_pdata *pdata =netdev_priv (ndev);
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +1 -1
@@ -859,7 +859,7 @@ static int xgene_enet_napi(struct napi_struct *napi, const int budget)return processed; } -static void xgene_enet_timeout (struct net_device *ndev) +static void xgene_enet_timeout (struct net_device *ndev,int txqueue) {struct xgene_enet_pdata *pdata =netdev_priv (ndev);struct netdev_queue *txq;
drivers/net/ethernet/apple/macmace.c +2 -2
@@ -91,7 +91,7 @@ static int mace_set_address(struct net_device *dev, void *addr);static void mace_reset (struct net_device *dev);static irqreturn_t mace_interrupt (int irq,void *dev_id);static irqreturn_t mace_dma_intr (int irq,void *dev_id); -static void mace_tx_timeout (struct net_device *dev); +static void mace_tx_timeout (struct net_device *dev,int txqueue);static void __mace_set_address (struct net_device *dev,void *addr);/*
@@ -600,7 +600,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static void mace_tx_timeout (struct net_device *dev) +static void mace_tx_timeout (struct net_device *dev,int txqueue) {struct mace_data *mp =netdev_priv (dev);volatile struct mace *mb = mp->mace;
drivers/net/ethernet/atheros/ag71xx.c +1 -1
@@ -1409,7 +1409,7 @@ static void ag71xx_oom_timer_handler(struct timer_list *t)napi_schedule (&ag->napi); } -static void ag71xx_tx_timeout (struct net_device *ndev) +static void ag71xx_tx_timeout (struct net_device *ndev,int txqueue) {struct ag71xx *ag =netdev_priv (ndev);
drivers/net/ethernet/atheros/alx/main.c +1 -1
@@ -1553,7 +1553,7 @@ static netdev_tx_t alx_start_xmit(struct sk_buff *skb,return alx_start_xmit_ring (skb,alx_tx_queue_mapping (alx, skb)); } -static void alx_tx_timeout (struct net_device *dev) +static void alx_tx_timeout (struct net_device *dev,int txqueue) {struct alx_priv *alx =netdev_priv (dev);
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1 -1
@@ -350,7 +350,7 @@ static void atl1c_del_timer(struct atl1c_adapter *adapter)* atl1c_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl1c_tx_timeout (struct net_device *netdev) +static void atl1c_tx_timeout (struct net_device *netdev,int txqueue) {struct atl1c_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +1 -1
@@ -251,7 +251,7 @@ static void atl1e_cancel_work(struct atl1e_adapter *adapter)* atl1e_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl1e_tx_timeout (struct net_device *netdev) +static void atl1e_tx_timeout (struct net_device *netdev,int txqueue) {struct atl1e_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/atheros/atlx/atl2.c +1 -1
@@ -1001,7 +1001,7 @@ static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)* atl2_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl2_tx_timeout (struct net_device *netdev) +static void atl2_tx_timeout (struct net_device *netdev,int txqueue) {struct atl2_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/broadcom/b44.c +1 -1
@@ -951,7 +951,7 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id)return IRQ_RETVAL (handled); } -static void b44_tx_timeout (struct net_device *dev) +static void b44_tx_timeout (struct net_device *dev,int txqueue) {struct b44 *bp =netdev_priv (dev);
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -1354,7 +1354,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,return ret; } -static void bcm_sysport_tx_timeout (struct net_device *dev) +static void bcm_sysport_tx_timeout (struct net_device *dev,int txqueue) {netdev_warn (dev,"transmit timeout!\n" );
drivers/net/ethernet/broadcom/bnx2.c +1 -1
@@ -6575,7 +6575,7 @@ bnx2_dump_state(struct bnx2 *bp) }static void -bnx2_tx_timeout (struct net_device *dev) +bnx2_tx_timeout (struct net_device *dev,int txqueue) {struct bnx2 *bp =netdev_priv (dev);
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -9936,7 +9936,7 @@ static void bnxt_reset_task(struct bnxt *bp, bool silent) } } -static void bnxt_tx_timeout (struct net_device *dev) +static void bnxt_tx_timeout (struct net_device *dev,int txqueue) {struct bnxt *bp =netdev_priv (dev);
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -1
@@ -3053,7 +3053,7 @@ static void bcmgenet_dump_tx_queue(struct bcmgenet_tx_ring *ring) ring->cb_ptr, ring->end_ptr); } -static void bcmgenet_timeout (struct net_device *dev) +static void bcmgenet_timeout (struct net_device *dev,int txqueue) {struct bcmgenet_priv *priv =netdev_priv (dev);u32 int0_enable =0 ;
drivers/net/ethernet/broadcom/tg3.c +1 -1
@@ -7645,7 +7645,7 @@ static void tg3_poll_controller(struct net_device *dev) }#endif -static void tg3_tx_timeout (struct net_device *dev) +static void tg3_tx_timeout (struct net_device *dev,int txqueue) {struct tg3 *tp =netdev_priv (dev);
drivers/net/ethernet/calxeda/xgmac.c +1 -1
@@ -1251,7 +1251,7 @@ static int xgmac_poll(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void xgmac_tx_timeout (struct net_device *dev) +static void xgmac_tx_timeout (struct net_device *dev,int txqueue) {struct xgmac_priv *priv =netdev_priv (dev);schedule_work (&priv->tx_timeout_work);
drivers/net/ethernet/cavium/liquidio/lio_main.c +1 -1
@@ -2562,7 +2562,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)/** \brief Network device Tx timeout * @param netdev pointer to network device */ -static void liquidio_tx_timeout (struct net_device *netdev) +static void liquidio_tx_timeout (struct net_device *netdev,int txqueue) {struct lio *lio;
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +1 -1
@@ -1628,7 +1628,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)/** \brief Network device Tx timeout * @param netdev pointer to network device */ -static void liquidio_tx_timeout (struct net_device *netdev) +static void liquidio_tx_timeout (struct net_device *netdev,int txqueue) {struct lio *lio;
drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +2 -2
@@ -31,7 +31,7 @@ static int lio_vf_rep_open(struct net_device *ndev);static int lio_vf_rep_stop (struct net_device *ndev);static netdev_tx_t lio_vf_rep_pkt_xmit (struct sk_buff *skb,struct net_device *ndev); -static void lio_vf_rep_tx_timeout (struct net_device *netdev); +static void lio_vf_rep_tx_timeout (struct net_device *netdev,int txqueue);static int lio_vf_rep_phys_port_name (struct net_device *dev,char *buf,size_t len); static void lio_vf_rep_get_stats64(struct net_device *dev,
@@ -172,7 +172,7 @@ lio_vf_rep_stop(struct net_device *ndev) }static void -lio_vf_rep_tx_timeout (struct net_device *ndev) +lio_vf_rep_tx_timeout (struct net_device *ndev,int txqueue) {netif_trans_update (ndev);
drivers/net/ethernet/cavium/thunder/nicvf_main.c +1 -1
@@ -1741,7 +1741,7 @@ static void nicvf_get_stats64(struct net_device *netdev, } -static void nicvf_tx_timeout (struct net_device *dev) +static void nicvf_tx_timeout (struct net_device *dev,int txqueue) {struct nicvf *nic =netdev_priv (dev);
drivers/net/ethernet/cirrus/cs89x0.c +1 -1
@@ -1128,7 +1128,7 @@ net_get_stats(struct net_device *dev)return &dev->stats; } -static void net_timeout (struct net_device *dev) +static void net_timeout (struct net_device *dev,int txqueue) {/* If we get here, some higher level has decided we are broken. There should really be a "kick me" function call instead. */
drivers/net/ethernet/cisco/enic/enic_main.c +1 -1
@@ -1095,7 +1095,7 @@ static void enic_set_rx_mode(struct net_device *netdev) }/* netif_tx_lock held, BHs disabled */ -static void enic_tx_timeout (struct net_device *netdev) +static void enic_tx_timeout (struct net_device *netdev,int txqueue) {struct enic *enic =netdev_priv (netdev);schedule_work (&enic->tx_hang_reset);
drivers/net/ethernet/cortina/gemini.c +1 -1
@@ -1296,7 +1296,7 @@ static int gmac_start_xmit(struct sk_buff *skb, struct net_device *netdev)return NETDEV_TX_OK ; } -static void gmac_tx_timeout (struct net_device *netdev) +static void gmac_tx_timeout (struct net_device *netdev,int txqueue) {netdev_err (netdev,"Tx timeout\n" );gmac_dump_dma_state (netdev);
drivers/net/ethernet/davicom/dm9000.c +1 -1
@@ -964,7 +964,7 @@ dm9000_init_dm9000(struct net_device *dev) }/* Our watchdog timed out. Called by the networking layer */ -static void dm9000_timeout (struct net_device *dev) +static void dm9000_timeout (struct net_device *dev,int txqueue) {struct board_info *db =netdev_priv (dev);u8 reg_save;
drivers/net/ethernet/dec/tulip/tulip_core.c +2 -2
@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(pci, tulip_pci_tbl);const char tulip_media_cap[32 ] = {0 ,0 ,0 ,16 ,3 ,19 ,16 ,24 ,27 ,4 ,7 ,5 ,0 ,20 ,23 ,20 ,28 ,31 ,0 ,0 , }; -static void tulip_tx_timeout (struct net_device *dev); +static void tulip_tx_timeout (struct net_device *dev,int txqueue);static void tulip_init_ring (struct net_device *dev);static void tulip_free_ring (struct net_device *dev); static netdev_tx_t tulip_start_xmit(struct sk_buff *skb,
@@ -534,7 +534,7 @@ tulip_open(struct net_device *dev) } -static void tulip_tx_timeout (struct net_device *dev) +static void tulip_tx_timeout (struct net_device *dev,int txqueue) {struct tulip_private *tp =netdev_priv (dev);void __iomem *ioaddr = tp->base_addr;
drivers/net/ethernet/dec/tulip/winbond-840.c +2 -2
@@ -331,7 +331,7 @@ static void netdev_timer(struct timer_list *t);static void init_rxtx_rings (struct net_device *dev);static void free_rxtx_rings (struct netdev_private *np);static void init_registers (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static int alloc_ringdesc (struct net_device *dev);static void free_ringdesc (struct netdev_private *np);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);
@@ -921,7 +921,7 @@ static void init_registers(struct net_device *dev)iowrite32 (0 , ioaddr + RxStartDemand); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base_addr;
drivers/net/ethernet/dlink/sundance.c +2 -2
@@ -432,7 +432,7 @@ static int mdio_wait_link(struct net_device *dev, int wait);static int netdev_open (struct net_device *dev);static void check_duplex (struct net_device *dev);static void netdev_timer (struct timer_list *t); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static int reset_tx (struct net_device *dev);
@@ -969,7 +969,7 @@ static void netdev_timer(struct timer_list *t)add_timer (&np->timer); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base;
drivers/net/ethernet/emulex/benet/be_main.c +1 -1
@@ -1417,7 +1417,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)return NETDEV_TX_OK ; } -static void be_tx_timeout (struct net_device *netdev) +static void be_tx_timeout (struct net_device *netdev,int txqueue) {struct be_adapter *adapter =netdev_priv (netdev);struct device *dev = &adapter->pdev->dev;
drivers/net/ethernet/ethoc.c +1 -1
@@ -869,7 +869,7 @@ static int ethoc_change_mtu(struct net_device *dev, int new_mtu)return -ENOSYS ; } -static void ethoc_tx_timeout (struct net_device *dev) +static void ethoc_tx_timeout (struct net_device *dev,int txqueue) {struct ethoc *priv =netdev_priv (dev);u32 pending =ethoc_read (priv,INT_SOURCE );
drivers/net/ethernet/faraday/ftgmac100.c +1 -1
@@ -1542,7 +1542,7 @@ static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, intreturn phy_mii_ioctl (netdev->phydev, ifr, cmd); } -static void ftgmac100_tx_timeout (struct net_device *netdev) +static void ftgmac100_tx_timeout (struct net_device *netdev,int txqueue) {struct ftgmac100 *priv =netdev_priv (netdev);
drivers/net/ethernet/fealnx.c +2 -2
@@ -428,7 +428,7 @@ static void getlinktype(struct net_device *dev);static void getlinkstatus (struct net_device *dev);static void netdev_timer (struct timer_list *t);static void reset_timer (struct timer_list *t); -static void fealnx_tx_timeout (struct net_device *dev); +static void fealnx_tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t intr_handler (int irq,void *dev_instance);
@@ -1191,7 +1191,7 @@ static void reset_timer(struct timer_list *t) } -static void fealnx_tx_timeout (struct net_device *dev) +static void fealnx_tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->mem;
drivers/net/ethernet/freescale/fec_main.c +1 -1
@@ -1141,7 +1141,7 @@ fec_stop(struct net_device *ndev)static void -fec_timeout (struct net_device *ndev) +fec_timeout (struct net_device *ndev,int txqueue) {struct fec_enet_private *fep =netdev_priv (ndev);
drivers/net/ethernet/freescale/fec_mpc52xx.c +1 -1
@@ -84,7 +84,7 @@ static int debug = -1; /* the above default */module_param (debug, int,0 );MODULE_PARM_DESC (debug,"debugging messages level" ); -static void mpc52xx_fec_tx_timeout (struct net_device *dev) +static void mpc52xx_fec_tx_timeout (struct net_device *dev,int txqueue) {struct mpc52xx_fec_priv *priv =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1 -1
@@ -641,7 +641,7 @@ static void fs_timeout_work(struct work_struct *work)netif_wake_queue (dev); } -static void fs_timeout (struct net_device *dev) +static void fs_timeout (struct net_device *dev,int txqueue) {struct fs_enet_private *fep =netdev_priv (dev);
drivers/net/ethernet/freescale/gianfar.c +1 -1
@@ -2092,7 +2092,7 @@ static void gfar_reset_task(struct work_struct *work)reset_gfar (priv->ndev); } -static void gfar_timeout (struct net_device *dev) +static void gfar_timeout (struct net_device *dev,int txqueue) {struct gfar_private *priv =netdev_priv (dev);
drivers/net/ethernet/freescale/ucc_geth.c +1 -1
@@ -3545,7 +3545,7 @@ static void ucc_geth_timeout_work(struct work_struct *work)* ucc_geth_timeout gets called when a packet has not been * transmitted after a set amount of time. */ -static void ucc_geth_timeout (struct net_device *dev) +static void ucc_geth_timeout (struct net_device *dev,int txqueue) {struct ucc_geth_private *ugeth =netdev_priv (dev);
drivers/net/ethernet/fujitsu/fmvj18x_cs.c +2 -2
@@ -93,7 +93,7 @@ static irqreturn_t fjn_interrupt(int irq, void *dev_id);static void fjn_rx (struct net_device *dev);static void fjn_reset (struct net_device *dev);static void set_rx_mode (struct net_device *dev); -static void fjn_tx_timeout (struct net_device *dev); +static void fjn_tx_timeout (struct net_device *dev,int txqueue);static const struct ethtool_ops netdev_ethtool_ops;/*
@@ -774,7 +774,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id)/*====================================================================*/ -static void fjn_tx_timeout (struct net_device *dev) +static void fjn_tx_timeout (struct net_device *dev,int txqueue) {struct local_info *lp =netdev_priv (dev);unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/google/gve/gve_main.c +1 -1
@@ -844,7 +844,7 @@ static void gve_turnup(struct gve_priv *priv)gve_set_napi_enabled (priv); } -static void gve_tx_timeout (struct net_device *dev) +static void gve_tx_timeout (struct net_device *dev,int txqueue) {struct gve_priv *priv =netdev_priv (dev);
drivers/net/ethernet/hisilicon/hip04_eth.c +1 -1
@@ -779,7 +779,7 @@ static int hip04_mac_stop(struct net_device *ndev)return 0 ; } -static void hip04_timeout (struct net_device *ndev) +static void hip04_timeout (struct net_device *ndev,int txqueue) {struct hip04_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +1 -1
@@ -893,7 +893,7 @@ static void hix5hd2_tx_timeout_task(struct work_struct *work)hix5hd2_net_open (priv->netdev); } -static void hix5hd2_net_timeout (struct net_device *dev) +static void hix5hd2_net_timeout (struct net_device *dev,int txqueue) {struct hix5hd2_priv *priv =netdev_priv (dev);
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -1485,7 +1485,7 @@ static int hns_nic_net_stop(struct net_device *ndev)static void hns_tx_timeout_reset (struct hns_nic_priv *priv);#define HNS_TX_TIMEO_LIMIT (40 * HZ) -static void hns_nic_net_timeout (struct net_device *ndev) +static void hns_nic_net_timeout (struct net_device *ndev,int txqueue) {struct hns_nic_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -1764,7 +1764,7 @@ static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev)return true; } -static void hns3_nic_net_timeout (struct net_device *ndev) +static void hns3_nic_net_timeout (struct net_device *ndev,int txqueue) {struct hns3_nic_priv *priv =netdev_priv (ndev);struct hnae3_handle *h = priv->ae_handle;
drivers/net/ethernet/huawei/hinic/hinic_main.c +1 -1
@@ -766,7 +766,7 @@ static void hinic_set_rx_mode(struct net_device *netdev)queue_work (nic_dev->workq, &rx_mode_work->work); } -static void hinic_tx_timeout (struct net_device *netdev) +static void hinic_tx_timeout (struct net_device *netdev,int txqueue) {struct hinic_dev *nic_dev =netdev_priv (netdev);
drivers/net/ethernet/i825xx/ether1.c +2 -2
@@ -66,7 +66,7 @@ static netdev_tx_t ether1_sendpacket(struct sk_buff *skb,static irqreturn_t ether1_interrupt (int irq,void *dev_id);static int ether1_close (struct net_device *dev);static void ether1_setmulticastlist (struct net_device *dev); -static void ether1_timeout (struct net_device *dev); +static void ether1_timeout (struct net_device *dev,int txqueue);/* ------------------------------------------------------------------------- */
@@ -650,7 +650,7 @@ ether1_open (struct net_device *dev) }static void -ether1_timeout (struct net_device *dev) +ether1_timeout (struct net_device *dev,int txqueue) {printk (KERN_WARNING "%s: transmit timeout, network cable problem?\n" , dev->name);
drivers/net/ethernet/i825xx/sun3_82586.c +2 -2
@@ -125,7 +125,7 @@ static netdev_tx_t sun3_82586_send_packet(struct sk_buff *, struct net_device *);static struct net_device_stats *sun3_82586_get_stats (struct net_device *dev);static void set_multicast_list (struct net_device *dev); -static void sun3_82586_timeout (struct net_device *dev); +static void sun3_82586_timeout (struct net_device *dev,int txqueue);#if 0 static void sun3_82586_dump (struct net_device *,void *);#endif
@@ -965,7 +965,7 @@ static void startrecv586(struct net_device *dev)WAIT_4_SCB_CMD_RUC ();/* wait for accept cmd. (no timeout!!) */ } -static void sun3_82586_timeout (struct net_device *dev) +static void sun3_82586_timeout (struct net_device *dev,int txqueue) {struct priv *p =netdev_priv (dev);#ifndef NO_NOPCOMMANDS
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -1
@@ -2786,7 +2786,7 @@ static void ehea_rereg_mrs(void)return ; } -static void ehea_tx_watchdog (struct net_device *dev) +static void ehea_tx_watchdog (struct net_device *dev,int txqueue) {struct ehea_port *port =netdev_priv (dev);
drivers/net/ethernet/ibm/emac/core.c +1 -1
@@ -776,7 +776,7 @@ static void emac_reset_work(struct work_struct *work)mutex_unlock (&dev->link_lock); } -static void emac_tx_timeout (struct net_device *ndev) +static void emac_tx_timeout (struct net_device *ndev,int txqueue) {struct emac_instance *dev =netdev_priv (ndev);
drivers/net/ethernet/ibm/ibmvnic.c +1 -1
@@ -2189,7 +2189,7 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,return -ret; } -static void ibmvnic_tx_timeout (struct net_device *dev) +static void ibmvnic_tx_timeout (struct net_device *dev,int txqueue) {struct ibmvnic_adapter *adapter =netdev_priv (dev);
drivers/net/ethernet/intel/e100.c +1 -1
@@ -2316,7 +2316,7 @@ static void e100_down(struct nic *nic)e100_rx_clean_list (nic); } -static void e100_tx_timeout (struct net_device *netdev) +static void e100_tx_timeout (struct net_device *netdev,int txqueue) {struct nic *nic =netdev_priv (netdev);
drivers/net/ethernet/intel/e1000/e1000_main.c +2 -2
@@ -134,7 +134,7 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);static void e1000_enter_82542_rst (struct e1000_adapter *adapter);static void e1000_leave_82542_rst (struct e1000_adapter *adapter); -static void e1000_tx_timeout (struct net_device *dev); +static void e1000_tx_timeout (struct net_device *dev,int txqueue);static void e1000_reset_task (struct work_struct *work);static void e1000_smartspeed (struct e1000_adapter *adapter); static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
@@ -3488,7 +3488,7 @@ static void e1000_dump(struct e1000_adapter *adapter)* e1000_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void e1000_tx_timeout (struct net_device *netdev) +static void e1000_tx_timeout (struct net_device *netdev,int txqueue) {struct e1000_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/e1000e/netdev.c +1 -1
@@ -5926,7 +5926,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,* e1000_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void e1000_tx_timeout (struct net_device *netdev) +static void e1000_tx_timeout (struct net_device *netdev,int txqueue) {struct e1000_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +1 -1
@@ -697,7 +697,7 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)* fm10k_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void fm10k_tx_timeout (struct net_device *netdev) +static void fm10k_tx_timeout (struct net_device *netdev,int txqueue) {struct fm10k_intfc *interface =netdev_priv (netdev);bool real_tx_hang = false;
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -301,7 +301,7 @@ void i40e_service_event_schedule(struct i40e_pf *pf)* device is munged, not just the one netdev port, so go for the full * reset. **/ -static void i40e_tx_timeout (struct net_device *netdev) +static void i40e_tx_timeout (struct net_device *netdev,int txqueue) {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_vsi *vsi = np->vsi;
drivers/net/ethernet/intel/iavf/iavf_main.c +1 -1
@@ -159,7 +159,7 @@ void iavf_schedule_reset(struct iavf_adapter *adapter)* iavf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void iavf_tx_timeout (struct net_device *netdev) +static void iavf_tx_timeout (struct net_device *netdev,int txqueue) {struct iavf_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
@@ -4627,7 +4627,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,* ice_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void ice_tx_timeout (struct net_device *netdev) +static void ice_tx_timeout (struct net_device *netdev,int txqueue) {struct ice_netdev_priv *np =netdev_priv (netdev);struct ice_ring *tx_ring =NULL ;
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
@@ -6173,7 +6173,7 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *skb,* igb_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void igb_tx_timeout (struct net_device *netdev) +static void igb_tx_timeout (struct net_device *netdev,int txqueue) {struct igb_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;
drivers/net/ethernet/intel/igbvf/netdev.c +1 -1
@@ -2375,7 +2375,7 @@ static netdev_tx_t igbvf_xmit_frame(struct sk_buff *skb,* igbvf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void igbvf_tx_timeout (struct net_device *netdev) +static void igbvf_tx_timeout (struct net_device *netdev,int txqueue) {struct igbvf_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ixgb/ixgb_main.c +2 -2
@@ -70,7 +70,7 @@ static int ixgb_clean(struct napi_struct *, int);static bool ixgb_clean_rx_irq (struct ixgb_adapter *,int *,int );static void ixgb_alloc_rx_buffers (struct ixgb_adapter *,int ); -static void ixgb_tx_timeout (struct net_device *dev); +static void ixgb_tx_timeout (struct net_device *dev,int txqueue);static void ixgb_tx_timeout_task (struct work_struct *work);static void ixgb_vlan_strip_enable (struct ixgb_adapter *adapter);
@@ -1538,7 +1538,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)**/ static void -ixgb_tx_timeout (struct net_device *netdev) +ixgb_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgb_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c +1 -1
@@ -166,7 +166,7 @@ static ssize_t ixgbe_dbg_netdev_ops_write(struct file *filp, ixgbe_dbg_netdev_ops_buf[len] ='\0' ;if (strncmp (ixgbe_dbg_netdev_ops_buf,"tx_timeout" ,10 ) ==0 ) { - adapter->netdev->netdev_ops->ndo_tx_timeout (adapter->netdev); + adapter->netdev->netdev_ops->ndo_tx_timeout (adapter->netdev,-1 );e_dev_info ("tx_timeout called\n" ); }else {e_dev_info ("Unknown command: %s\n" , ixgbe_dbg_netdev_ops_buf);
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -1
@@ -6158,7 +6158,7 @@ static void ixgbe_set_eee_capable(struct ixgbe_adapter *adapter)* ixgbe_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void ixgbe_tx_timeout (struct net_device *netdev) +static void ixgbe_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgbe_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -1
@@ -250,7 +250,7 @@ static void ixgbevf_tx_timeout_reset(struct ixgbevf_adapter *adapter)* ixgbevf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void ixgbevf_tx_timeout (struct net_device *netdev) +static void ixgbevf_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgbevf_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/jme.c +1 -1
@@ -2337,7 +2337,7 @@ jme_change_mtu(struct net_device *netdev, int new_mtu) }static void -jme_tx_timeout (struct net_device *netdev) +jme_tx_timeout (struct net_device *netdev,int txqueue) {struct jme_adapter *jme =netdev_priv (netdev);
drivers/net/ethernet/korina.c +1 -1
@@ -917,7 +917,7 @@ static void korina_restart_task(struct work_struct *work)enable_irq (lp->rx_irq); } -static void korina_tx_timeout (struct net_device *dev) +static void korina_tx_timeout (struct net_device *dev,int txqueue) {struct korina_private *lp =netdev_priv (dev);
drivers/net/ethernet/lantiq_etop.c +1 -1
@@ -594,7 +594,7 @@ ltq_etop_init(struct net_device *dev) }static void -ltq_etop_tx_timeout (struct net_device *dev) +ltq_etop_tx_timeout (struct net_device *dev,int txqueue) {int err;
drivers/net/ethernet/marvell/mv643xx_eth.c +1 -1
@@ -2590,7 +2590,7 @@ static void tx_timeout_task(struct work_struct *ugly) } } -static void mv643xx_eth_tx_timeout (struct net_device *dev) +static void mv643xx_eth_tx_timeout (struct net_device *dev,int txqueue) {struct mv643xx_eth_private *mp =netdev_priv (dev);
drivers/net/ethernet/marvell/pxa168_eth.c +1 -1
@@ -742,7 +742,7 @@ static int txq_reclaim(struct net_device *dev, int force)return released; } -static void pxa168_eth_tx_timeout (struct net_device *dev) +static void pxa168_eth_tx_timeout (struct net_device *dev,int txqueue) {struct pxa168_eth_private *pep =netdev_priv (dev);
drivers/net/ethernet/marvell/skge.c +1 -1
@@ -2884,7 +2884,7 @@ static void skge_tx_clean(struct net_device *dev) skge->tx_ring.to_clean = e; } -static void skge_tx_timeout (struct net_device *dev) +static void skge_tx_timeout (struct net_device *dev,int txqueue) {struct skge_port *skge =netdev_priv (dev);
drivers/net/ethernet/marvell/sky2.c +1 -1
@@ -2358,7 +2358,7 @@ static void sky2_qlink_intr(struct sky2_hw *hw)/* Transmit timeout is only called if we are running, carrier is up * and tx queue is full (stopped). */ -static void sky2_tx_timeout (struct net_device *dev) +static void sky2_tx_timeout (struct net_device *dev,int txqueue) {struct sky2_port *sky2 =netdev_priv (dev);struct sky2_hw *hw = sky2->hw;
drivers/net/ethernet/mediatek/mtk_eth_soc.c +1 -1
@@ -2083,7 +2083,7 @@ static void mtk_dma_free(struct mtk_eth *eth)kfree (eth->scratch_head); } -static void mtk_tx_timeout (struct net_device *dev) +static void mtk_tx_timeout (struct net_device *dev,int txqueue) {struct mtk_mac *mac =netdev_priv (dev);struct mtk_eth *eth = mac->hw;
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -1354,7 +1354,7 @@ static void mlx4_en_delete_rss_steer_rules(struct mlx4_en_priv *priv) } } -static void mlx4_en_tx_timeout (struct net_device *dev) +static void mlx4_en_tx_timeout (struct net_device *dev,int txqueue) {struct mlx4_en_priv *priv =netdev_priv (dev);struct mlx4_en_dev *mdev = priv->mdev;
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -4337,7 +4337,7 @@ static void mlx5e_tx_timeout_work(struct work_struct *work)rtnl_unlock (); } -static void mlx5e_tx_timeout (struct net_device *dev) +static void mlx5e_tx_timeout (struct net_device *dev,int txqueue) {struct mlx5e_priv *priv =netdev_priv (dev);
drivers/net/ethernet/micrel/ks8842.c +1 -1
@@ -1103,7 +1103,7 @@ static void ks8842_tx_timeout_work(struct work_struct *work)__ks8842_start_new_rx_dma (netdev); } -static void ks8842_tx_timeout (struct net_device *netdev) +static void ks8842_tx_timeout (struct net_device *netdev,int txqueue) {struct ks8842_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/micrel/ksz884x.c +1 -1
@@ -4896,7 +4896,7 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)* triggered to free up resources so that the transmit routine can continue * sending out packets. The hardware is reset to correct the problem. */ -static void netdev_tx_timeout (struct net_device *dev) +static void netdev_tx_timeout (struct net_device *dev,int txqueue) {static unsigned long last_reset;
drivers/net/ethernet/microchip/enc28j60.c +1 -1
@@ -1325,7 +1325,7 @@ static irqreturn_t enc28j60_irq(int irq, void *dev_id)return IRQ_HANDLED ; } -static void enc28j60_tx_timeout (struct net_device *ndev) +static void enc28j60_tx_timeout (struct net_device *ndev,int txqueue) {struct enc28j60_net *priv =netdev_priv (ndev);
drivers/net/ethernet/microchip/encx24j600.c +1 -1
@@ -892,7 +892,7 @@ static netdev_tx_t encx24j600_tx(struct sk_buff *skb, struct net_device *dev) }/* Deal with a transmit timeout */ -static void encx24j600_tx_timeout (struct net_device *dev) +static void encx24j600_tx_timeout (struct net_device *dev,int txqueue) {struct encx24j600_priv *priv =netdev_priv (dev);
drivers/net/ethernet/natsemi/natsemi.c +2 -2
@@ -612,7 +612,7 @@ static void undo_cable_magic(struct net_device *dev);static void check_link (struct net_device *dev);static void netdev_timer (struct timer_list *t);static void dump_ring (struct net_device *dev); -static void ns_tx_timeout (struct net_device *dev); +static void ns_tx_timeout (struct net_device *dev,int txqueue);static int alloc_ring (struct net_device *dev);static void refill_rx (struct net_device *dev);static void init_ring (struct net_device *dev);
@@ -1881,7 +1881,7 @@ static void dump_ring(struct net_device *dev) } } -static void ns_tx_timeout (struct net_device *dev) +static void ns_tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem * ioaddr =ns_ioaddr (dev);
drivers/net/ethernet/natsemi/ns83820.c +1 -1
@@ -1549,7 +1549,7 @@ static int ns83820_stop(struct net_device *ndev)return 0 ; } -static void ns83820_tx_timeout (struct net_device *ndev) +static void ns83820_tx_timeout (struct net_device *ndev,int txqueue) {struct ns83820 *dev =PRIV (ndev);u32 tx_done_idx;
drivers/net/ethernet/neterion/s2io.c +1 -1
@@ -7238,7 +7238,7 @@ static void s2io_restart_nic(struct work_struct *work)* void */ -static void s2io_tx_watchdog (struct net_device *dev) +static void s2io_tx_watchdog (struct net_device *dev,int txqueue) {struct s2io_nic *sp =netdev_priv (dev);struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
drivers/net/ethernet/neterion/vxge/vxge-main.c +1 -1
@@ -3273,7 +3273,7 @@ static int vxge_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)* This function is triggered if the Tx Queue is stopped * for a pre-defined amount of time when the Interface is still up. */ -static void vxge_tx_watchdog (struct net_device *dev) +static void vxge_tx_watchdog (struct net_device *dev,int txqueue) {struct vxgedev *vdev;
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +1 -1
@@ -1320,7 +1320,7 @@ nfp_net_tx_ring_reset(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring)netdev_tx_reset_queue (nd_q); } -static void nfp_net_tx_timeout (struct net_device *netdev) +static void nfp_net_tx_timeout (struct net_device *netdev,int txqueue) {struct nfp_net *nn =netdev_priv (netdev);int i;
drivers/net/ethernet/nvidia/forcedeth.c +1 -1
@@ -2700,7 +2700,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)* nv_tx_timeout: dev->tx_timeout function * Called with netif_tx_lock held. */ -static void nv_tx_timeout (struct net_device *dev) +static void nv_tx_timeout (struct net_device *dev,int txqueue) {struct fe_priv *np =netdev_priv (dev);u8 __iomem *base =get_hwbase (dev);
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +1 -1
@@ -2271,7 +2271,7 @@ static int pch_gbe_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)* pch_gbe_tx_timeout - Respond to a Tx Hang * @netdev: Network interface device structure */ -static void pch_gbe_tx_timeout (struct net_device *netdev) +static void pch_gbe_tx_timeout (struct net_device *netdev,int txqueue) {struct pch_gbe_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/packetengines/hamachi.c +2 -2
@@ -548,7 +548,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int valstatic int hamachi_open (struct net_device *dev);static int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void hamachi_timer (struct timer_list *t); -static void hamachi_tx_timeout (struct net_device *dev); +static void hamachi_tx_timeout (struct net_device *dev,int txqueue);static void hamachi_init_ring (struct net_device *dev);static netdev_tx_t hamachi_start_xmit (struct sk_buff *skb,struct net_device *dev);
@@ -1042,7 +1042,7 @@ static void hamachi_timer(struct timer_list *t)add_timer (&hmp->timer); } -static void hamachi_tx_timeout (struct net_device *dev) +static void hamachi_tx_timeout (struct net_device *dev,int txqueue) {int i;struct hamachi_private *hmp =netdev_priv (dev);
drivers/net/ethernet/packetengines/yellowfin.c +2 -2
@@ -344,7 +344,7 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int valuestatic int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static int yellowfin_open (struct net_device *dev);static void yellowfin_timer (struct timer_list *t); -static void yellowfin_tx_timeout (struct net_device *dev); +static void yellowfin_tx_timeout (struct net_device *dev,int txqueue);static int yellowfin_init_ring (struct net_device *dev);static netdev_tx_t yellowfin_start_xmit (struct sk_buff *skb,struct net_device *dev);
@@ -677,7 +677,7 @@ static void yellowfin_timer(struct timer_list *t)add_timer (&yp->timer); } -static void yellowfin_tx_timeout (struct net_device *dev) +static void yellowfin_tx_timeout (struct net_device *dev,int txqueue) {struct yellowfin_private *yp =netdev_priv (dev);void __iomem *ioaddr = yp->base;
drivers/net/ethernet/pensando/ionic/ionic_lif.c +1 -1
@@ -1268,7 +1268,7 @@ static void ionic_tx_timeout_work(struct work_struct *ws)rtnl_unlock (); } -static void ionic_tx_timeout (struct net_device *netdev) +static void ionic_tx_timeout (struct net_device *netdev,int txqueue) {struct ionic_lif *lif =netdev_priv (netdev);
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +2 -2
@@ -49,7 +49,7 @@ static int netxen_nic_open(struct net_device *netdev);static int netxen_nic_close (struct net_device *netdev);static netdev_tx_t netxen_nic_xmit_frame (struct sk_buff *,struct net_device *); -static void netxen_tx_timeout (struct net_device *netdev); +static void netxen_tx_timeout (struct net_device *netdev,int txqueue);static void netxen_tx_timeout_task (struct work_struct *work);static void netxen_fw_poll_work (struct work_struct *work); static void netxen_schedule_work(struct netxen_adapter *adapter,
@@ -2222,7 +2222,7 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)netxen_advert_link_change (adapter, linkup); } -static void netxen_tx_timeout (struct net_device *netdev) +static void netxen_tx_timeout (struct net_device *netdev,int txqueue) {struct netxen_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/qlogic/qla3xxx.c +1 -1
@@ -3602,7 +3602,7 @@ static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)return 0 ; } -static void ql3xxx_tx_timeout (struct net_device *ndev) +static void ql3xxx_tx_timeout (struct net_device *ndev,int txqueue) {struct ql3_adapter *qdev =netdev_priv (ndev);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +2 -2
@@ -56,7 +56,7 @@ static int qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent);static void qlcnic_remove (struct pci_dev *pdev);static int qlcnic_open (struct net_device *netdev);static int qlcnic_close (struct net_device *netdev); -static void qlcnic_tx_timeout (struct net_device *netdev); +static void qlcnic_tx_timeout (struct net_device *netdev,int txqueue);static void qlcnic_attach_work (struct work_struct *work);static void qlcnic_fwinit_work (struct work_struct *work);
@@ -3068,7 +3068,7 @@ static void qlcnic_dump_rings(struct qlcnic_adapter *adapter) } -static void qlcnic_tx_timeout (struct net_device *netdev) +static void qlcnic_tx_timeout (struct net_device *netdev,int txqueue) {struct qlcnic_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/qualcomm/emac/emac.c +1 -1
@@ -282,7 +282,7 @@ static int emac_close(struct net_device *netdev) }/* Respond to a TX hang */ -static void emac_tx_timeout (struct net_device *netdev) +static void emac_tx_timeout (struct net_device *netdev,int txqueue) {struct emac_adapter *adpt =netdev_priv (netdev);
drivers/net/ethernet/qualcomm/qca_spi.c +1 -1
@@ -786,7 +786,7 @@ qcaspi_netdev_xmit(struct sk_buff *skb, struct net_device *dev) }static void -qcaspi_netdev_tx_timeout (struct net_device *dev) +qcaspi_netdev_tx_timeout (struct net_device *dev,int txqueue) {struct qcaspi *qca =netdev_priv (dev);
drivers/net/ethernet/qualcomm/qca_uart.c +1 -1
@@ -248,7 +248,7 @@ qcauart_netdev_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void qcauart_netdev_tx_timeout (struct net_device *dev) +static void qcauart_netdev_tx_timeout (struct net_device *dev,int txqueue) {struct qcauart *qca =netdev_priv (dev);
drivers/net/ethernet/rdc/r6040.c +1 -1
@@ -410,7 +410,7 @@ static void r6040_init_mac_regs(struct net_device *dev)iowrite16 (TM2TX , ioaddr +MTPR ); } -static void r6040_tx_timeout (struct net_device *dev) +static void r6040_tx_timeout (struct net_device *dev,int txqueue) {struct r6040_private *priv =netdev_priv (dev);void __iomem *ioaddr = priv->base;
drivers/net/ethernet/realtek/8139cp.c +1 -1
@@ -1235,7 +1235,7 @@ static int cp_close (struct net_device *dev)return 0 ; } -static void cp_tx_timeout (struct net_device *dev) +static void cp_tx_timeout (struct net_device *dev,int txqueue) {struct cp_private *cp =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/realtek/atp.c +2 -2
@@ -204,7 +204,7 @@ static void net_rx(struct net_device *dev);static void read_block (long ioaddr,int length,unsigned char *buffer,int data_mode);static int net_close (struct net_device *dev);static void set_rx_mode (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);/* A list of all installed ATP devices, for removing the driver module. */
@@ -533,7 +533,7 @@ static void write_packet(long ioaddr, int length, unsigned char *packet, int padoutb (Ctrl_HNibWrite | Ctrl_SelData | Ctrl_IRQEN, ioaddr +PAR_CONTROL ); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {long ioaddr = dev->base_addr;
drivers/net/ethernet/realtek/r8169_main.c +1 -1
@@ -5662,7 +5662,7 @@ static void rtl_reset_work(struct rtl8169_private *tp)netif_wake_queue (dev); } -static void rtl8169_tx_timeout (struct net_device *dev) +static void rtl8169_tx_timeout (struct net_device *dev,int txqueue) {struct rtl8169_private *tp =netdev_priv (dev);
drivers/net/ethernet/renesas/ravb_main.c +1 -1
@@ -1425,7 +1425,7 @@ static int ravb_open(struct net_device *ndev) }/* Timeout function for Ethernet AVB */ -static void ravb_tx_timeout (struct net_device *ndev) +static void ravb_tx_timeout (struct net_device *ndev,int txqueue) {struct ravb_private *priv =netdev_priv (ndev);
drivers/net/ethernet/renesas/sh_eth.c +1 -1
@@ -2478,7 +2478,7 @@ static int sh_eth_open(struct net_device *ndev) }/* Timeout function */ -static void sh_eth_tx_timeout (struct net_device *ndev) +static void sh_eth_tx_timeout (struct net_device *ndev,int txqueue) {struct sh_eth_private *mdp =netdev_priv (ndev);struct sh_eth_rxdesc *rxdesc;
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +1 -1
@@ -1572,7 +1572,7 @@ static int sxgbe_poll(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void sxgbe_tx_timeout (struct net_device *dev) +static void sxgbe_tx_timeout (struct net_device *dev,int txqueue) {struct sxgbe_priv_data *priv =netdev_priv (dev);
drivers/net/ethernet/seeq/ether3.c +2 -2
@@ -79,7 +79,7 @@ static netdev_tx_t ether3_sendpacket(struct sk_buff *skb,static irqreturn_t ether3_interrupt (int irq,void *dev_id);static int ether3_close (struct net_device *dev);static void ether3_setmulticastlist (struct net_device *dev); -static void ether3_timeout (struct net_device *dev); +static void ether3_timeout (struct net_device *dev,int txqueue);#define BUS_16 2#define BUS_8 1
@@ -450,7 +450,7 @@ static void ether3_setmulticastlist(struct net_device *dev)ether3_outw (priv (dev)->regs.config1 |CFG1_LOCBUFMEM ,REG_CONFIG1 ); } -static void ether3_timeout (struct net_device *dev) +static void ether3_timeout (struct net_device *dev,int txqueue) {unsigned long flags;
drivers/net/ethernet/seeq/sgiseeq.c +1 -1
@@ -645,7 +645,7 @@ sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void timeout (struct net_device *dev) +static void timeout (struct net_device *dev,int txqueue) {printk (KERN_NOTICE "%s: transmit timed out, resetting\n" , dev->name);sgiseeq_reset (dev);
drivers/net/ethernet/sgi/ioc3-eth.c +2 -2
@@ -113,7 +113,7 @@ struct ioc3_private {static int ioc3_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void ioc3_set_multicast_list (struct net_device *dev);static netdev_tx_t ioc3_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void ioc3_timeout (struct net_device *dev); +static void ioc3_timeout (struct net_device *dev,int txqueue);static inline unsigned int ioc3_hash (const unsigned char *addr);static void ioc3_start (struct ioc3_private *ip);static inline void ioc3_stop (struct ioc3_private *ip);
@@ -1493,7 +1493,7 @@ static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void ioc3_timeout (struct net_device *dev) +static void ioc3_timeout (struct net_device *dev,int txqueue) {struct ioc3_private *ip =netdev_priv (dev);
drivers/net/ethernet/sgi/meth.c +2 -2
@@ -90,7 +90,7 @@ struct meth_private {spinlock_t meth_lock; }; -static void meth_tx_timeout (struct net_device *dev); +static void meth_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t meth_interrupt (int irq,void *dev_id);/* global, initialized in ip32-setup.c */
@@ -727,7 +727,7 @@ static netdev_tx_t meth_tx(struct sk_buff *skb, struct net_device *dev)/* * Deal with a transmit timeout. */ -static void meth_tx_timeout (struct net_device *dev) +static void meth_tx_timeout (struct net_device *dev,int txqueue) {struct meth_private *priv =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/silan/sc92031.c +1 -1
@@ -1078,7 +1078,7 @@ static void sc92031_set_multicast_list(struct net_device *dev)spin_unlock_bh (&priv->lock); } -static void sc92031_tx_timeout (struct net_device *dev) +static void sc92031_tx_timeout (struct net_device *dev,int txqueue) {struct sc92031_priv *priv =netdev_priv (dev);
drivers/net/ethernet/sis/sis190.c +1 -1
@@ -1538,7 +1538,7 @@ static struct net_device *sis190_init_board(struct pci_dev *pdev) goto out; } -static void sis190_tx_timeout (struct net_device *dev) +static void sis190_tx_timeout (struct net_device *dev,int txqueue) {struct sis190_private *tp =netdev_priv (dev);void __iomem *ioaddr = tp->mmio_addr;
drivers/net/ethernet/smsc/epic100.c +2 -2
@@ -291,7 +291,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);static void mdio_write (struct net_device *dev,int phy_id,int loc,int val);static void epic_restart (struct net_device *dev);static void epic_timer (struct timer_list *t); -static void epic_tx_timeout (struct net_device *dev); +static void epic_tx_timeout (struct net_device *dev,int txqueue);static void epic_init_ring (struct net_device *dev);static netdev_tx_t epic_start_xmit (struct sk_buff *skb,struct net_device *dev);
@@ -861,7 +861,7 @@ static void epic_timer(struct timer_list *t)add_timer (&ep->timer); } -static void epic_tx_timeout (struct net_device *dev) +static void epic_tx_timeout (struct net_device *dev,int txqueue) {struct epic_private *ep =netdev_priv (dev);void __iomem *ioaddr = ep->ioaddr;
drivers/net/ethernet/smsc/smc911x.c +1 -1
@@ -1245,7 +1245,7 @@ static void smc911x_poll_controller(struct net_device *dev)#endif /* Our watchdog timed out. Called by the networking layer */ -static void smc911x_timeout (struct net_device *dev) +static void smc911x_timeout (struct net_device *dev,int txqueue) {struct smc911x_local *lp =netdev_priv (dev);int status, mask;
drivers/net/ethernet/smsc/smc9194.c +2 -2
@@ -216,7 +216,7 @@ static int smc_open(struct net_device *dev);/* . Our watchdog timed out. Called by the networking layer */ -static void smc_timeout (struct net_device *dev); +static void smc_timeout (struct net_device *dev,int txqueue);/* . This is called by the kernel in response to 'ifconfig ethX down'. It
@@ -1094,7 +1094,7 @@ static int smc_open(struct net_device *dev).-------------------------------------------------------- */ -static void smc_timeout (struct net_device *dev) +static void smc_timeout (struct net_device *dev,int txqueue) {/* If we get here, some higher level has decided we are broken. There should really be a "kick me" function call instead. */
drivers/net/ethernet/smsc/smc91c92_cs.c +2 -2
@@ -271,7 +271,7 @@ static void smc91c92_release(struct pcmcia_device *link);static int smc_open (struct net_device *dev);static int smc_close (struct net_device *dev);static int smc_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); -static void smc_tx_timeout (struct net_device *dev); +static void smc_tx_timeout (struct net_device *dev,int txqueue);static netdev_tx_t smc_start_xmit (struct sk_buff *skb,struct net_device *dev);static irqreturn_t smc_interrupt (int irq,void *dev_id);
@@ -1178,7 +1178,7 @@ static void smc_hardware_send_packet(struct net_device * dev)/*====================================================================*/ -static void smc_tx_timeout (struct net_device *dev) +static void smc_tx_timeout (struct net_device *dev,int txqueue) {struct smc_private *smc =netdev_priv (dev);unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/smsc/smc91x.c +1 -1
@@ -1321,7 +1321,7 @@ static void smc_poll_controller(struct net_device *dev)#endif /* Our watchdog timed out. Called by the networking layer */ -static void smc_timeout (struct net_device *dev) +static void smc_timeout (struct net_device *dev,int txqueue) {struct smc_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->base;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -3712,7 +3712,7 @@ static int stmmac_napi_poll_tx(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void stmmac_tx_timeout (struct net_device *dev) +static void stmmac_tx_timeout (struct net_device *dev,int txqueue) {struct stmmac_priv *priv =netdev_priv (dev);
drivers/net/ethernet/sun/cassini.c +1 -1
@@ -2666,7 +2666,7 @@ static void cas_netpoll(struct net_device *dev) }#endif -static void cas_tx_timeout (struct net_device *dev) +static void cas_tx_timeout (struct net_device *dev,int txqueue) {struct cas *cp =netdev_priv (dev);
drivers/net/ethernet/sun/niu.c +1 -1
@@ -6517,7 +6517,7 @@ static void niu_reset_task(struct work_struct *work)spin_unlock_irqrestore (&np->lock, flags); } -static void niu_tx_timeout (struct net_device *dev) +static void niu_tx_timeout (struct net_device *dev,int txqueue) {struct niu *np =netdev_priv (dev);
drivers/net/ethernet/sun/sunbmac.c +1 -1
@@ -941,7 +941,7 @@ static int bigmac_close(struct net_device *dev)return 0 ; } -static void bigmac_tx_timeout (struct net_device *dev) +static void bigmac_tx_timeout (struct net_device *dev,int txqueue) {struct bigmac *bp =netdev_priv (dev);
drivers/net/ethernet/sun/sungem.c +1 -1
@@ -970,7 +970,7 @@ static void gem_poll_controller(struct net_device *dev) }#endif -static void gem_tx_timeout (struct net_device *dev) +static void gem_tx_timeout (struct net_device *dev,int txqueue) {struct gem *gp =netdev_priv (dev);
drivers/net/ethernet/sun/sunhme.c +1 -1
@@ -2246,7 +2246,7 @@ static int happy_meal_close(struct net_device *dev)#define SXD (x)#endif -static void happy_meal_tx_timeout (struct net_device *dev) +static void happy_meal_tx_timeout (struct net_device *dev,int txqueue) {struct happy_meal *hp =netdev_priv (dev);
drivers/net/ethernet/sun/sunqe.c +1 -1
@@ -544,7 +544,7 @@ static void qe_tx_reclaim(struct sunqe *qep) qep->tx_old = elem; } -static void qe_tx_timeout (struct net_device *dev) +static void qe_tx_timeout (struct net_device *dev,int txqueue) {struct sunqe *qep =netdev_priv (dev);int tx_full;
drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +1 -1
@@ -689,7 +689,7 @@ static int xlgmac_close(struct net_device *netdev)return 0 ; } -static void xlgmac_tx_timeout (struct net_device *netdev) +static void xlgmac_tx_timeout (struct net_device *netdev,int txqueue) {struct xlgmac_pdata *pdata =netdev_priv (netdev);
drivers/net/ethernet/ti/cpmac.c +1 -1
@@ -797,7 +797,7 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id)return IRQ_HANDLED ; } -static void cpmac_tx_timeout (struct net_device *dev) +static void cpmac_tx_timeout (struct net_device *dev,int txqueue) {struct cpmac_priv *priv =netdev_priv (dev);
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -2035,7 +2035,7 @@ static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd)return phy_mii_ioctl (cpsw->slaves[slave_no].phy, req, cmd); } -static void cpsw_ndo_tx_timeout (struct net_device *ndev) +static void cpsw_ndo_tx_timeout (struct net_device *ndev,int txqueue) {struct cpsw_priv *priv =netdev_priv (ndev);struct cpsw_common *cpsw = priv->cpsw;
drivers/net/ethernet/ti/davinci_emac.c +1 -1
@@ -983,7 +983,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)* error and re-initialize the TX channel for hardware operation * */ -static void emac_dev_tx_timeout (struct net_device *ndev) +static void emac_dev_tx_timeout (struct net_device *ndev,int txqueue) {struct emac_priv *priv =netdev_priv (ndev);struct device *emac_dev = &ndev->dev;
drivers/net/ethernet/ti/netcp_core.c +1 -1
@@ -1811,7 +1811,7 @@ static int netcp_ndo_ioctl(struct net_device *ndev,return (ret ==0 ) ?0 : err; } -static void netcp_ndo_tx_timeout (struct net_device *ndev) +static void netcp_ndo_tx_timeout (struct net_device *ndev,int txqueue) {struct netcp_intf *netcp =netdev_priv (ndev);unsigned int descs =knav_pool_count (netcp->tx_pool);
drivers/net/ethernet/ti/tlan.c +2 -2
@@ -161,7 +161,7 @@ static void tlan_set_multicast_list(struct net_device *);static int tlan_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static int tlan_probe1 (struct pci_dev *pdev,long ioaddr,int irq,int rev,const struct pci_device_id *ent); -static void tlan_tx_timeout (struct net_device *dev); +static void tlan_tx_timeout (struct net_device *dev,int txqueue);static void tlan_tx_timeout_work (struct work_struct *work);static int tlan_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);
@@ -997,7 +997,7 @@ static int tlan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)* **************************************************************/ -static void tlan_tx_timeout (struct net_device *dev) +static void tlan_tx_timeout (struct net_device *dev,int txqueue) {TLAN_DBG (TLAN_DEBUG_GNRL ,"%s: Transmit timed out.\n" , dev->name);
drivers/net/ethernet/toshiba/ps3_gelic_net.c +1 -1
@@ -1405,7 +1405,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work)* * called, if tx hangs. Schedules a task that resets the interface */ -void gelic_net_tx_timeout (struct net_device *netdev) +void gelic_net_tx_timeout (struct net_device *netdev,int txqueue) {struct gelic_card *card;
drivers/net/ethernet/toshiba/spider_net.c +1 -1
@@ -2180,7 +2180,7 @@ spider_net_tx_timeout_task(struct work_struct *work)* called, if tx hangs. Schedules a task that resets the interface */ static void -spider_net_tx_timeout (struct net_device *netdev) +spider_net_tx_timeout (struct net_device *netdev,int txqueue) {struct spider_net_card *card;
drivers/net/ethernet/toshiba/tc35815.c +2 -2
@@ -483,7 +483,7 @@ static void tc35815_txdone(struct net_device *dev);static int tc35815_close (struct net_device *dev);static struct net_device_stats *tc35815_get_stats (struct net_device *dev);static void tc35815_set_multicast_list (struct net_device *dev); -static void tc35815_tx_timeout (struct net_device *dev); +static void tc35815_tx_timeout (struct net_device *dev,int txqueue);static int tc35815_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);#ifdef CONFIG_NET_POLL_CONTROLLER static void tc35815_poll_controller (struct net_device *dev);
@@ -1189,7 +1189,7 @@ static void tc35815_schedule_restart(struct net_device *dev)spin_unlock_irqrestore (&lp->lock, flags); } -static void tc35815_tx_timeout (struct net_device *dev) +static void tc35815_tx_timeout (struct net_device *dev,int txqueue) {struct tc35815_regs __iomem *tr = (struct tc35815_regs __iomem *)dev->base_addr;
drivers/net/ethernet/via/via-rhine.c +2 -2
@@ -506,7 +506,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int valstatic int rhine_open (struct net_device *dev);static void rhine_reset_task (struct work_struct *work);static void rhine_slow_event_task (struct work_struct *work); -static void rhine_tx_timeout (struct net_device *dev); +static void rhine_tx_timeout (struct net_device *dev,int txqueue);static netdev_tx_t rhine_start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t rhine_interrupt (int irq,void *dev_instance);
@@ -1761,7 +1761,7 @@ static void rhine_reset_task(struct work_struct *work)mutex_unlock (&rp->task_lock); } -static void rhine_tx_timeout (struct net_device *dev) +static void rhine_tx_timeout (struct net_device *dev,int txqueue) {struct rhine_private *rp =netdev_priv (dev);void __iomem *ioaddr = rp->base;
drivers/net/ethernet/wiznet/w5100.c +1 -1
@@ -790,7 +790,7 @@ static void w5100_restart_work(struct work_struct *work)w5100_restart (priv->ndev); } -static void w5100_tx_timeout (struct net_device *ndev) +static void w5100_tx_timeout (struct net_device *ndev,int txqueue) {struct w5100_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/wiznet/w5300.c +1 -1
@@ -341,7 +341,7 @@ static void w5300_get_regs(struct net_device *ndev, } } -static void w5300_tx_timeout (struct net_device *ndev) +static void w5300_tx_timeout (struct net_device *ndev,int txqueue) {struct w5300_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
@@ -521,7 +521,7 @@ static int xemaclite_set_mac_address(struct net_device *dev, void *address)* * This function is called when Tx time out occurs for Emaclite device. */ -static void xemaclite_tx_timeout (struct net_device *dev) +static void xemaclite_tx_timeout (struct net_device *dev,int txqueue) {struct net_local *lp =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/xircom/xirc2ps_cs.c +2 -2
@@ -288,7 +288,7 @@ struct local_info {*/ static netdev_tx_t do_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void xirc_tx_timeout (struct net_device *dev); +static void xirc_tx_timeout (struct net_device *dev,int txqueue);static void xirc2ps_tx_timeout_task (struct work_struct *work);static void set_addresses (struct net_device *dev);static void set_multicast_list (struct net_device *dev);
@@ -1203,7 +1203,7 @@ xirc2ps_tx_timeout_task(struct work_struct *work) }static void -xirc_tx_timeout (struct net_device *dev) +xirc_tx_timeout (struct net_device *dev,int txqueue) {struct local_info *lp =netdev_priv (dev); dev->stats.tx_errors++;
drivers/net/fjes/fjes_main.c +1 -1
@@ -792,7 +792,7 @@ fjes_xmit_frame(struct sk_buff *skb, struct net_device *netdev)return ret; } -static void fjes_tx_retry (struct net_device *netdev) +static void fjes_tx_retry (struct net_device *netdev,int txqueue) {struct netdev_queue *queue =netdev_get_tx_queue (netdev,0 );
drivers/net/slip/slip.c +1 -1
@@ -457,7 +457,7 @@ static void slip_write_wakeup(struct tty_struct *tty)schedule_work (&sl->tx_work); } -static void sl_tx_timeout (struct net_device *dev) +static void sl_tx_timeout (struct net_device *dev,int txqueue) {struct slip *sl =netdev_priv (dev);
drivers/net/usb/catc.c +1 -1
@@ -447,7 +447,7 @@ static netdev_tx_t catc_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void catc_tx_timeout (struct net_device *netdev) +static void catc_tx_timeout (struct net_device *netdev,int txqueue) {struct catc *catc =netdev_priv (netdev);
drivers/net/usb/hso.c +1 -1
@@ -820,7 +820,7 @@ static const struct ethtool_ops ops = { };/* called when a packet did not ack after watchdogtimeout */ -static void hso_net_tx_timeout (struct net_device *net) +static void hso_net_tx_timeout (struct net_device *net,int txqueue) {struct hso_net *odev =netdev_priv (net);
drivers/net/usb/ipheth.c +1 -1
@@ -400,7 +400,7 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)return NETDEV_TX_OK ; } -static void ipheth_tx_timeout (struct net_device *net) +static void ipheth_tx_timeout (struct net_device *net,int txqueue) {struct ipheth_device *dev =netdev_priv (net);
drivers/net/usb/kaweth.c +1 -1
@@ -894,7 +894,7 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)/**************************************************************** * kaweth_tx_timeout ****************************************************************/ -static void kaweth_tx_timeout (struct net_device *net) +static void kaweth_tx_timeout (struct net_device *net,int txqueue) {struct kaweth_device *kaweth =netdev_priv (net);
drivers/net/usb/lan78xx.c +1 -1
@@ -3662,7 +3662,7 @@ static void lan78xx_disconnect(struct usb_interface *intf)usb_put_dev (udev); } -static void lan78xx_tx_timeout (struct net_device *net) +static void lan78xx_tx_timeout (struct net_device *net,int txqueue) {struct lan78xx_net *dev =netdev_priv (net);
drivers/net/usb/pegasus.c +1 -1
@@ -693,7 +693,7 @@ static void intr_callback(struct urb *urb) "can't resubmit interrupt urb, %d\n", res); } -static void pegasus_tx_timeout (struct net_device *net) +static void pegasus_tx_timeout (struct net_device *net,int txqueue) {pegasus_t *pegasus =netdev_priv (net);netif_warn (pegasus, timer, net,"tx timeout\n" );
drivers/net/usb/r8152.c +1 -1
@@ -2306,7 +2306,7 @@ static void rtl_drop_queued_tx(struct r8152 *tp) } } -static void rtl8152_tx_timeout (struct net_device *netdev) +static void rtl8152_tx_timeout (struct net_device *netdev,int txqueue) {struct r8152 *tp =netdev_priv (netdev);
drivers/net/usb/rtl8150.c +1 -1
@@ -655,7 +655,7 @@ static void disable_net_traffic(rtl8150_t * dev)set_registers (dev,CR ,1 , &cr); } -static void rtl8150_tx_timeout (struct net_device *netdev) +static void rtl8150_tx_timeout (struct net_device *netdev,int txqueue) {rtl8150_t *dev =netdev_priv (netdev);dev_warn (&netdev->dev,"Tx timeout.\n" );
drivers/net/vmxnet3/vmxnet3_drv.c +1 -1
@@ -3198,7 +3198,7 @@ vmxnet3_free_intr_resources(struct vmxnet3_adapter *adapter)static void -vmxnet3_tx_timeout (struct net_device *netdev) +vmxnet3_tx_timeout (struct net_device *netdev,int txqueue) {struct vmxnet3_adapter *adapter =netdev_priv (netdev); adapter->tx_timeout_count++;
drivers/net/wan/cosa.c +2 -2
@@ -268,7 +268,7 @@ static int cosa_net_attach(struct net_device *dev, unsigned short encoding, unsigned short parity);static int cosa_net_open (struct net_device *d);static int cosa_net_close (struct net_device *d); -static void cosa_net_timeout (struct net_device *d); +static void cosa_net_timeout (struct net_device *d,int txqueue);static netdev_tx_t cosa_net_tx (struct sk_buff *skb,struct net_device *d);static char *cosa_net_setup_rx (struct channel_data *channel,int size);static int cosa_net_rx_done (struct channel_data *channel);
@@ -670,7 +670,7 @@ static netdev_tx_t cosa_net_tx(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void cosa_net_timeout (struct net_device *dev) +static void cosa_net_timeout (struct net_device *dev,int txqueue) {struct channel_data *chan =dev_to_chan (dev);
drivers/net/wan/farsync.c +1 -1
@@ -2239,7 +2239,7 @@ fst_attach(struct net_device *dev, unsigned short encoding, unsigned short parit }static void -fst_tx_timeout (struct net_device *dev) +fst_tx_timeout (struct net_device *dev,int txqueue) {struct fst_port_info *port;struct fst_card_info *card;
drivers/net/wan/fsl_ucc_hdlc.c +1 -1
@@ -1039,7 +1039,7 @@ static const struct dev_pm_ops uhdlc_pm_ops = {#define HDLC_PM_OPS NULL#endif -static void uhdlc_tx_timeout (struct net_device *ndev) +static void uhdlc_tx_timeout (struct net_device *ndev,int txqueue) {netdev_err (ndev,"%s\n" , __func__); }
drivers/net/wan/lmc/lmc_main.c +2 -2
@@ -99,7 +99,7 @@ static int lmc_ifdown(struct net_device * const);static void lmc_watchdog (struct timer_list *t);static void lmc_reset (lmc_softc_t *const sc);static void lmc_dec_reset (lmc_softc_t *const sc); -static void lmc_driver_timeout (struct net_device *dev); +static void lmc_driver_timeout (struct net_device *dev,int txqueue);/* * linux reserves 16 device specific IOCTLs. We call them
@@ -2044,7 +2044,7 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, /*fold00lmc_trace (sc->lmc_device,"lmc_initcsrs out" ); } -static void lmc_driver_timeout (struct net_device *dev) +static void lmc_driver_timeout (struct net_device *dev,int txqueue) {lmc_softc_t *sc =dev_to_sc (dev);u32 csr6;
drivers/net/wan/x25_asy.c +1 -1
@@ -276,7 +276,7 @@ static void x25_asy_write_wakeup(struct tty_struct *tty) sl->xhead += actual; } -static void x25_asy_timeout (struct net_device *dev) +static void x25_asy_timeout (struct net_device *dev,int txqueue) {struct x25_asy *sl =netdev_priv (dev);
drivers/net/wireless/intel/ipw2x00/ipw2100.c +1 -1
@@ -5834,7 +5834,7 @@ static int ipw2100_close(struct net_device *dev)/* * TODO: Fix this function... its just wrong */ -static void ipw2100_tx_timeout (struct net_device *dev) +static void ipw2100_tx_timeout (struct net_device *dev,int txqueue) {struct ipw2100_priv *priv =libipw_priv (dev);
drivers/net/wireless/intersil/hostap/hostap_main.c +1 -1
@@ -761,7 +761,7 @@ static void hostap_set_multicast_list(struct net_device *dev) } -static void prism2_tx_timeout (struct net_device *dev) +static void prism2_tx_timeout (struct net_device *dev,int txqueue) {struct hostap_interface *iface;local_info_t *local;
drivers/net/wireless/intersil/orinoco/main.c +1 -1
@@ -647,7 +647,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, struct hermes *hw)netif_wake_queue (dev); } -void orinoco_tx_timeout (struct net_device *dev) +void orinoco_tx_timeout (struct net_device *dev,int txqueue) {struct orinoco_private *priv =ndev_priv (dev);struct net_device_stats *stats = &dev->stats;
drivers/net/wireless/marvell/mwifiex/main.c +1 -1
@@ -1019,7 +1019,7 @@ static void mwifiex_set_multicast_list(struct net_device *dev)* CFG802.11 network device handler for transmission timeout. */ static void -mwifiex_tx_timeout (struct net_device *dev) +mwifiex_tx_timeout (struct net_device *dev,int txqueue) {struct mwifiex_private *priv =mwifiex_netdev_get_priv (dev);
drivers/net/wireless/quantenna/qtnfmac/core.c +1 -1
@@ -148,7 +148,7 @@ static void qtnf_netdev_get_stats64(struct net_device *ndev,/* Netdev handler for transmission timeout. */ -static void qtnf_netdev_tx_timeout (struct net_device *ndev) +static void qtnf_netdev_tx_timeout (struct net_device *ndev,int txqueue) {struct qtnf_vif *vif =qtnf_netdev_get_priv (ndev);struct qtnf_wmac *mac;
drivers/net/wireless/wl3501_cs.c +1 -1
@@ -1285,7 +1285,7 @@ static int wl3501_reset(struct net_device *dev)return rc; } -static void wl3501_tx_timeout (struct net_device *dev) +static void wl3501_tx_timeout (struct net_device *dev,int txqueue) {struct net_device_stats *stats = &dev->stats;int rc;
drivers/net/wireless/zydas/zd1201.c +1 -1
@@ -830,7 +830,7 @@ static netdev_tx_t zd1201_hard_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void zd1201_tx_timeout (struct net_device *dev) +static void zd1201_tx_timeout (struct net_device *dev,int txqueue) {struct zd1201 *zd =netdev_priv (dev);
drivers/staging/ks7010/ks_wlan_net.c +2 -2
@@ -45,7 +45,7 @@ struct wep_key {* function prototypes */ static int ks_wlan_open (struct net_device *dev); -static void ks_wlan_tx_timeout (struct net_device *dev); +static void ks_wlan_tx_timeout (struct net_device *dev,int txqueue);static int ks_wlan_start_xmit (struct sk_buff *skb,struct net_device *dev);static int ks_wlan_close (struct net_device *dev);static void ks_wlan_set_rx_mode (struct net_device *dev);
@@ -2498,7 +2498,7 @@ int ks_wlan_set_mac_address(struct net_device *dev, void *addr) }static -void ks_wlan_tx_timeout (struct net_device *dev) +void ks_wlan_tx_timeout (struct net_device *dev,int txqueue) {struct ks_wlan_private *priv =netdev_priv (dev);
drivers/staging/qlge/qlge_main.c +1 -1
@@ -4436,7 +4436,7 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)return status; } -static void qlge_tx_timeout (struct net_device *ndev) +static void qlge_tx_timeout (struct net_device *ndev,int txqueue) {struct ql_adapter *qdev =netdev_priv (ndev);ql_queue_asic_error (qdev);
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -1
@@ -267,7 +267,7 @@ static short _rtl92e_check_nic_enough_desc(struct net_device *dev, int prio)return 0 ; } -static void _rtl92e_tx_timeout (struct net_device *dev) +static void _rtl92e_tx_timeout (struct net_device *dev,int txqueue) {struct r8192_priv *priv =rtllib_priv (dev);
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -654,7 +654,7 @@ short check_nic_enough_desc(struct net_device *dev, int queue_index)return (used <MAX_TX_URB ); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct r8192_priv *priv =ieee80211_priv (dev);
drivers/staging/unisys/visornic/visornic_main.c +1 -1
@@ -1078,7 +1078,7 @@ static void visornic_set_multi(struct net_device *netdev)* Queue the work and return. Make sure we have not already been informed that * the IO Partition is gone; if so, we will have already timed-out the xmits. */ -static void visornic_xmit_timeout (struct net_device *netdev) +static void visornic_xmit_timeout (struct net_device *netdev,int txqueue) {struct visornic_devdata *devdata =netdev_priv (netdev);unsigned long flags;
drivers/staging/wlan-ng/p80211netdev.c +2 -2
@@ -101,7 +101,7 @@ static void p80211knetdev_set_multicast_list(struct net_device *dev);static int p80211knetdev_do_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd);static int p80211knetdev_set_mac_address (struct net_device *dev,void *addr); -static void p80211knetdev_tx_timeout (struct net_device *netdev); +static void p80211knetdev_tx_timeout (struct net_device *netdev,int txqueue);static int p80211_rx_typedrop (struct wlandevice *wlandev,u16 fc);int wlan_watchdog =5000 ;
@@ -1074,7 +1074,7 @@ static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc)return drop; } -static void p80211knetdev_tx_timeout (struct net_device *netdev) +static void p80211knetdev_tx_timeout (struct net_device *netdev,int txqueue) {struct wlandevice *wlandev = netdev->ml_priv;
drivers/tty/n_gsm.c +1 -1
@@ -2704,7 +2704,7 @@ static netdev_tx_t gsm_mux_net_start_xmit(struct sk_buff *skb, }/* called when a packet did not ack after watchdogtimeout */ -static void gsm_mux_net_tx_timeout (struct net_device *net) +static void gsm_mux_net_tx_timeout (struct net_device *net,int txqueue) {/* Tell syslog we are hosed. */ dev_dbg (&net->dev,"Tx timed out.\n" );
drivers/tty/synclink.c +1 -1
@@ -7837,7 +7837,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {struct mgsl_struct *info =dev_to_port (dev);unsigned long flags;
drivers/tty/synclink_gt.c +1 -1
@@ -1682,7 +1682,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {struct slgt_info *info =dev_to_port (dev);unsigned long flags;
drivers/tty/synclinkmp.c +1 -1
@@ -1807,7 +1807,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {SLMP_INFO *info =dev_to_port (dev);unsigned long flags;
include/linux/netdevice.h +3 -2
@@ -1004,7 +1004,7 @@ struct tlsdev_ops;* Called when a user wants to change the Maximum Transfer Unit * of a device. * -* void (*ndo_tx_timeout)(struct net_device *dev); +* void (*ndo_tx_timeout)(struct net_device *dev, int txqueue); * Callback used when the transmitter has not made any progress * for dev->watchdog ticks. *
@@ -1271,7 +1271,8 @@ struct net_device_ops { int new_mtu);int (*ndo_neigh_setup)(struct net_device *dev,struct neigh_parms *); -void (*ndo_tx_timeout) (struct net_device *dev); +void (*ndo_tx_timeout) (struct net_device *dev, +int txqueue);void (*ndo_get_stats64)(struct net_device *dev,struct rtnl_link_stats64 *storage);
net/atm/lec.c +1 -1
@@ -194,7 +194,7 @@ lec_send(struct atm_vcc *vcc, struct sk_buff *skb) dev->stats.tx_bytes += skb->len; } -static void lec_tx_timeout (struct net_device *dev) +static void lec_tx_timeout (struct net_device *dev,int txqueue) {pr_info ("%s\n" , dev->name);netif_trans_update (dev);
net/bluetooth/bnep/netdev.c +1 -1
@@ -112,7 +112,7 @@ static int bnep_net_set_mac_addr(struct net_device *dev, void *arg)return 0 ; } -static void bnep_net_timeout (struct net_device *dev) +static void bnep_net_timeout (struct net_device *dev,int txqueue) {BT_DBG ("net_timeout" );netif_wake_queue (dev);
net/sched/sch_generic.c +1 -1
@@ -446,7 +446,7 @@ static void dev_watchdog(struct timer_list *t)trace_net_dev_xmit_timeout (dev, i);WARN_ONCE (1 ,KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n" , dev->name,netdev_drivername (dev), i); - dev->netdev_ops->ndo_tx_timeout (dev); + dev->netdev_ops->ndo_tx_timeout (dev, i); } if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies +
Michael S. Tsirkin
maintainerQuoted 118 lines · Julio Faracco
Hi Michael,
Em sex., 22 de nov. de 2019 às 07:31, Michael S. Tsirkin <[email protected]> escreveu:
Quoted 99 lines · Julio Faracco
Quoted 84 lines
Driver
virtio_netis not handling error events for TX provided bydev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.This commit brings back
virtnet_resetmethod to recover TX queues from a error state. That function is called byschedule_workmethod and it puts the reset function into work queue.As the error cause is unknown at this moment, it would be better to reset all queues.
Signed-off-by Julio Faracco <[email protected]>Signed-off-by Daiane Mendes <[email protected]>Cc Jason Wang <[email protected]>---
v1-v2: Tagnet-nextwas included to indentify where patch would be applied.--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +11
-1@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev);drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2600
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name);What does this mean?
Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2610
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + }Can we make the warning less cryptic?
I wonder why don't we get the sq from timeout directly? Would seem cleaner.
Quoted 2 lines
I need your help with debbuging information. What kind of field shoud it notify when a TX timeout occurs?
I am just saying this: why don't we add a "txqueue" parameter to ndo_tx_timeout? It's not hard - just need to be careful to fix all callers. I got the list of files and functions by grepping for ndo_tx_timeout. The massaged it with the following script.
#/usr/bin/perl
use strict;
use warnings;
our $^I = '.bak';
my @work = (
["arch/m68k/emu/nfeth.c", "nfeth_tx_timeout"],
["arch/um/drivers/net_kern.c", "uml_net_tx_timeout"],
["arch/um/drivers/vector_kern.c", "vector_net_tx_timeout"],
["arch/xtensa/platforms/iss/network.c", "iss_net_tx_timeout"], ["drivers/char/pcmcia/synclink_cs.c", "hdlcdev_tx_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"],
["drivers/message/fusion/mptlan.c", "mpt_lan_tx_timeout"],
["drivers/misc/sgi-xp/xpnet.c", "xpnet_dev_tx_timeout"],
["drivers/net/appletalk/cops.c", "cops_timeout"],
["drivers/net/arcnet/arcnet.c", "arcnet_timeout"],
["drivers/net/arcnet/com20020.c", "arcnet_timeout"],
["drivers/net/ethernet/3com/3c509.c", "el3_tx_timeout"],
["drivers/net/ethernet/3com/3c515.c", "corkscrew_timeout"], ["drivers/net/ethernet/3com/3c574_cs.c", "el3_tx_timeout"], ["drivers/net/ethernet/3com/3c589_cs.c", "el3_tx_timeout"],
["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"],
["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"],
["drivers/net/ethernet/3com/typhoon.c", "typhoon_tx_timeout"],
["drivers/net/ethernet/8390/8390.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/8390p.c", "eip_tx_timeout"],
["drivers/net/ethernet/8390/ax88796.c", "ax_ei_tx_timeout"], ["drivers/net/ethernet/8390/axnet_cs.c", "axnet_tx_timeout"], ["drivers/net/ethernet/8390/etherh.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/hydra.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/mac8390.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/mcf8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/ne2k-pci.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/pcnet_cs.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/smc-ultra.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/wd.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/zorro8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/adaptec/starfire.c", "tx_timeout"],
["drivers/net/ethernet/agere/et131x.c", "et131x_tx_timeout"], ["drivers/net/ethernet/allwinner/sun4i-emac.c", "emac_timeout"], ["drivers/net/ethernet/alteon/acenic.c", "ace_watchdog"], ["drivers/net/ethernet/amazon/ena/ena_netdev.c", "ena_tx_timeout"], ["drivers/net/ethernet/amd/a2065.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/am79c961a.c", "am79c961_timeout"], ["drivers/net/ethernet/amd/amd8111e.c", "amd8111e_tx_timeout"], ["drivers/net/ethernet/amd/ariadne.c", "ariadne_tx_timeout"], ["drivers/net/ethernet/amd/atarilance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/au1000_eth.c", "au1000_tx_timeout"], ["drivers/net/ethernet/amd/declance.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/lance.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/mvme147.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/ni65.c", "ni65_timeout"],
["drivers/net/ethernet/amd/nmclan_cs.c", "mace_tx_timeout"],
["drivers/net/ethernet/amd/pcnet32.c", "pcnet32_tx_timeout"], ["drivers/net/ethernet/amd/sunlance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/xgbe/xgbe-drv.c", "xgbe_tx_timeout"], ["drivers/net/ethernet/apm/xgene-v2/main.c", "xge_timeout"], ["drivers/net/ethernet/apm/xgene/xgene_enet_main.c", "xgene_enet_timeout"], ["drivers/net/ethernet/apple/macmace.c", "mace_tx_timeout"], ["drivers/net/ethernet/atheros/ag71xx.c", "ag71xx_tx_timeout"], ["drivers/net/ethernet/atheros/alx/main.c", "alx_tx_timeout"], ["drivers/net/ethernet/atheros/atl1c/atl1c_main.c", "atl1c_tx_timeout"], ["drivers/net/ethernet/atheros/atl1e/atl1e_main.c", "atl1e_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl1.c", "atlx_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl2.c", "atl2_tx_timeout"], ["drivers/net/ethernet/broadcom/b44.c", "b44_tx_timeout"], ["drivers/net/ethernet/broadcom/bcmsysport.c", "bcm_sysport_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2.c", "bnx2_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c", "bnx2x_tx_timeout"], ["drivers/net/ethernet/broadcom/bnxt/bnxt.c", "bnxt_tx_timeout"], ["drivers/net/ethernet/broadcom/genet/bcmgenet.c", "bcmgenet_timeout"], ["drivers/net/ethernet/broadcom/sb1250-mac.c", "sbmac_tx_timeout"], ["drivers/net/ethernet/broadcom/tg3.c", "tg3_tx_timeout"],
["drivers/net/ethernet/calxeda/xgmac.c", "xgmac_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c", "lio_vf_rep_tx_timeout"], ["drivers/net/ethernet/cavium/thunder/nicvf_main.c", "nicvf_tx_timeout"], ["drivers/net/ethernet/cirrus/cs89x0.c", "net_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cortina/gemini.c", "gmac_tx_timeout"], ["drivers/net/ethernet/davicom/dm9000.c", "dm9000_timeout"], ["drivers/net/ethernet/dec/tulip/de2104x.c", "de_tx_timeout"], ["drivers/net/ethernet/dec/tulip/tulip_core.c", "tulip_tx_timeout"], ["drivers/net/ethernet/dec/tulip/winbond-840.c", "tx_timeout"], ["drivers/net/ethernet/dlink/dl2k.c", "rio_tx_timeout"],
["drivers/net/ethernet/dlink/sundance.c", "tx_timeout"], ["drivers/net/ethernet/emulex/benet/be_main.c", "be_tx_timeout"],
["drivers/net/ethernet/ethoc.c", "ethoc_tx_timeout"],
["drivers/net/ethernet/faraday/ftgmac100.c", "ftgmac100_tx_timeout"], ["drivers/net/ethernet/fealnx.c", "fealnx_tx_timeout"], ["drivers/net/ethernet/freescale/dpaa/dpaa_eth.c", "dpaa_tx_timeout"], ["drivers/net/ethernet/freescale/fec_main.c", "fec_timeout"], ["drivers/net/ethernet/freescale/fec_mpc52xx.c", "mpc52xx_fec_tx_timeout"], ["drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c", "fs_timeout"], ["drivers/net/ethernet/freescale/gianfar.c", "gfar_timeout"], ["drivers/net/ethernet/freescale/ucc_geth.c", "ucc_geth_timeout"], ["drivers/net/ethernet/fujitsu/fmvj18x_cs.c", "fjn_tx_timeout"], ["drivers/net/ethernet/google/gve/gve_main.c", "gve_tx_timeout"], ["drivers/net/ethernet/hisilicon/hip04_eth.c", "hip04_timeout"], ["drivers/net/ethernet/hisilicon/hix5hd2_gmac.c", "hix5hd2_net_timeout"], ["drivers/net/ethernet/hisilicon/hns/hns_enet.c", "hns_nic_net_timeout"], ["drivers/net/ethernet/hisilicon/hns3/hns3_enet.c", "hns3_nic_net_timeout"], ["drivers/net/ethernet/huawei/hinic/hinic_main.c", "hinic_tx_timeout"], ["drivers/net/ethernet/i825xx/82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/ether1.c", "ether1_timeout"], ["drivers/net/ethernet/i825xx/lib82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/sun3_82586.c", "sun3_82586_timeout"], ["drivers/net/ethernet/ibm/ehea/ehea_main.c", "ehea_tx_watchdog"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"],
["drivers/net/ethernet/ibm/ibmvnic.c", "ibmvnic_tx_timeout"],
["drivers/net/ethernet/intel/e100.c", "e100_tx_timeout"], ["drivers/net/ethernet/intel/e1000/e1000_main.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/e1000e/netdev.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/fm10k/fm10k_netdev.c", "fm10k_tx_timeout"], ["drivers/net/ethernet/intel/i40e/i40e_main.c", "i40e_tx_timeout"], ["drivers/net/ethernet/intel/iavf/iavf_main.c", "iavf_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/igb/igb_main.c", "igb_tx_timeout"], ["drivers/net/ethernet/intel/igbvf/netdev.c", "igbvf_tx_timeout"], ["drivers/net/ethernet/intel/ixgb/ixgb_main.c", "ixgb_tx_timeout"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c", "adapter->netdev->netdev_ops->ndo_tx_timeout(adapter->netdev);"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_main.c", "ixgbe_tx_timeout"], ["drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c", "ixgbevf_tx_timeout"], ["drivers/net/ethernet/jme.c", "jme_tx_timeout"],
["drivers/net/ethernet/korina.c", "korina_tx_timeout"],
["drivers/net/ethernet/lantiq_etop.c", "ltq_etop_tx_timeout"], ["drivers/net/ethernet/marvell/mv643xx_eth.c", "mv643xx_eth_tx_timeout"], ["drivers/net/ethernet/marvell/pxa168_eth.c", "pxa168_eth_tx_timeout"], ["drivers/net/ethernet/marvell/skge.c", "skge_tx_timeout"],
["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"],
["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"], ["drivers/net/ethernet/mediatek/mtk_eth_soc.c", "mtk_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx5/core/en_main.c", "mlx5e_tx_timeout"], ["drivers/net/ethernet/micrel/ks8842.c", "ks8842_tx_timeout"], ["drivers/net/ethernet/micrel/ksz884x.c", "netdev_tx_timeout"], ["drivers/net/ethernet/microchip/enc28j60.c", "enc28j60_tx_timeout"], ["drivers/net/ethernet/microchip/encx24j600.c", "encx24j600_tx_timeout"], ["drivers/net/ethernet/natsemi/jazzsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/macsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/natsemi.c", "ns_tx_timeout"], ["drivers/net/ethernet/natsemi/ns83820.c", "ns83820_tx_timeout"], ["drivers/net/ethernet/natsemi/xtsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/neterion/s2io.c", "s2io_tx_watchdog"], ["drivers/net/ethernet/neterion/vxge/vxge-main.c", "vxge_tx_watchdog"], ["drivers/net/ethernet/netronome/nfp/nfp_net_common.c", "nfp_net_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c", "pch_gbe_tx_timeout"], ["drivers/net/ethernet/packetengines/hamachi.c", "hamachi_tx_timeout"], ["drivers/net/ethernet/packetengines/yellowfin.c", "yellowfin_tx_timeout"], ["drivers/net/ethernet/pensando/ionic/ionic_lif.c", "ionic_tx_timeout"], ["drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c", "netxen_tx_timeout"], ["drivers/net/ethernet/qlogic/qla3xxx.c", "ql3xxx_tx_timeout"], ["drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c", "qlcnic_tx_timeout"], ["drivers/net/ethernet/qualcomm/emac/emac.c", "emac_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_spi.c", "qcaspi_netdev_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_uart.c", "qcauart_netdev_tx_timeout"], ["drivers/net/ethernet/rdc/r6040.c", "r6040_tx_timeout"],
["drivers/net/ethernet/realtek/8139cp.c", "cp_tx_timeout"], ["drivers/net/ethernet/realtek/8139too.c", "rtl8139_tx_timeout"], ["drivers/net/ethernet/realtek/atp.c", "tx_timeout"],
["drivers/net/ethernet/realtek/r8169_main.c", "rtl8169_tx_timeout"], ["drivers/net/ethernet/renesas/ravb_main.c", "ravb_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c", "sxgbe_tx_timeout"], ["drivers/net/ethernet/seeq/ether3.c", "ether3_timeout"],
["drivers/net/ethernet/seeq/sgiseeq.c", "timeout"],
["drivers/net/ethernet/sfc/efx.c", "efx_watchdog"],
["drivers/net/ethernet/sfc/falcon/efx.c", "ef4_watchdog"],
["drivers/net/ethernet/sgi/ioc3-eth.c", "ioc3_timeout"],
["drivers/net/ethernet/sgi/meth.c", "meth_tx_timeout"],
["drivers/net/ethernet/silan/sc92031.c", "sc92031_tx_timeout"], ["drivers/net/ethernet/sis/sis190.c", "sis190_tx_timeout"],
["drivers/net/ethernet/sis/sis900.c", "sis900_tx_timeout"],
["drivers/net/ethernet/smsc/epic100.c", "epic_tx_timeout"],
["drivers/net/ethernet/smsc/smc911x.c", "smc911x_timeout"],
["drivers/net/ethernet/smsc/smc9194.c", "smc_timeout"],
["drivers/net/ethernet/smsc/smc91c92_cs.c", "smc_tx_timeout"], ["drivers/net/ethernet/smsc/smc91x.c", "smc_timeout"], ["drivers/net/ethernet/stmicro/stmmac/stmmac_main.c", "stmmac_tx_timeout"], ["drivers/net/ethernet/sun/cassini.c", "cas_tx_timeout"],
["drivers/net/ethernet/sun/ldmvsw.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/sun/niu.c", "niu_tx_timeout"],
["drivers/net/ethernet/sun/sunbmac.c", "bigmac_tx_timeout"],
["drivers/net/ethernet/sun/sungem.c", "gem_tx_timeout"],
["drivers/net/ethernet/sun/sunhme.c", "happy_meal_tx_timeout"], ["drivers/net/ethernet/sun/sunqe.c", "qe_tx_timeout"],
["drivers/net/ethernet/sun/sunvnet.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/synopsys/dwc-xlgmac-net.c", "xlgmac_tx_timeout"], ["drivers/net/ethernet/ti/cpmac.c", "cpmac_tx_timeout"],
["drivers/net/ethernet/ti/cpsw.c", "cpsw_ndo_tx_timeout"], ["drivers/net/ethernet/ti/davinci_emac.c", "emac_dev_tx_timeout"], ["drivers/net/ethernet/ti/netcp_core.c", "netcp_ndo_tx_timeout"], ["drivers/net/ethernet/ti/tlan.c", "tlan_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_net.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_wireless.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/spider_net.c", "spider_net_tx_timeout"], ["drivers/net/ethernet/toshiba/tc35815.c", "tc35815_tx_timeout"], ["drivers/net/ethernet/via/via-rhine.c", "rhine_tx_timeout"], ["drivers/net/ethernet/wiznet/w5100.c", "w5100_tx_timeout"], ["drivers/net/ethernet/wiznet/w5300.c", "w5300_tx_timeout"], ["drivers/net/ethernet/xilinx/xilinx_emaclite.c", "xemaclite_tx_timeout"], ["drivers/net/ethernet/xircom/xirc2ps_cs.c", "xirc_tx_timeout"],
["drivers/net/fjes/fjes_main.c", "fjes_tx_retry"],
["drivers/net/slip/slip.c", "sl_tx_timeout"],
["drivers/net/usb/aqc111.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/ax88172a.c", "usbnet_tx_timeout"],
["drivers/net/usb/ax88179_178a.c", "usbnet_tx_timeout"],
["drivers/net/usb/catc.c", "catc_tx_timeout"],
["drivers/net/usb/cdc_mbim.c", "usbnet_tx_timeout"],
["drivers/net/usb/cdc_ncm.c", "usbnet_tx_timeout"],
["drivers/net/usb/dm9601.c", "usbnet_tx_timeout"],
["drivers/net/usb/hso.c", "hso_net_tx_timeout"],
["drivers/net/usb/int51x1.c", "usbnet_tx_timeout"],
["drivers/net/usb/ipheth.c", "ipheth_tx_timeout"],
["drivers/net/usb/kaweth.c", "kaweth_tx_timeout"],
["drivers/net/usb/lan78xx.c", "lan78xx_tx_timeout"],
["drivers/net/usb/mcs7830.c", "usbnet_tx_timeout"],
["drivers/net/usb/pegasus.c", "pegasus_tx_timeout"],
["drivers/net/usb/qmi_wwan.c", "usbnet_tx_timeout"],
["drivers/net/usb/r8152.c", "rtl8152_tx_timeout"],
["drivers/net/usb/rndis_host.c", "usbnet_tx_timeout"],
["drivers/net/usb/rtl8150.c", "rtl8150_tx_timeout"],
["drivers/net/usb/sierra_net.c", "usbnet_tx_timeout"],
["drivers/net/usb/smsc75xx.c", "usbnet_tx_timeout"],
["drivers/net/usb/smsc95xx.c", "usbnet_tx_timeout"],
["drivers/net/usb/sr9700.c", "usbnet_tx_timeout"],
["drivers/net/usb/sr9800.c", "usbnet_tx_timeout"],
["drivers/net/usb/usbnet.c", "usbnet_tx_timeout"],
["drivers/net/vmxnet3/vmxnet3_drv.c", "vmxnet3_tx_timeout"],
["drivers/net/wan/cosa.c", "cosa_net_timeout"],
["drivers/net/wan/farsync.c", "fst_tx_timeout"],
["drivers/net/wan/fsl_ucc_hdlc.c", "uhdlc_tx_timeout"],
["drivers/net/wan/lmc/lmc_main.c", "lmc_driver_timeout"],
["drivers/net/wan/x25_asy.c", "x25_asy_timeout"],
["drivers/net/wimax/i2400m/netdev.c", "i2400m_tx_timeout"], ["drivers/net/wireless/intel/ipw2x00/ipw2100.c", "ipw2100_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/main.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/orinoco_usb.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/prism54/islpci_dev.c", "islpci_eth_tx_timeout"], ["drivers/net/wireless/marvell/mwifiex/main.c", "mwifiex_tx_timeout"], ["drivers/net/wireless/quantenna/qtnfmac/core.c", "qtnf_netdev_tx_timeout"], ["drivers/net/wireless/rndis_wlan.c", "usbnet_tx_timeout"],
["drivers/net/wireless/wl3501_cs.c", "wl3501_tx_timeout"],
["drivers/net/wireless/zydas/zd1201.c", "zd1201_tx_timeout"],
["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"],
["drivers/staging/ks7010/ks_wlan_net.c", "ks_wlan_tx_timeout"], ["drivers/staging/qlge/qlge_main.c", "qlge_tx_timeout"], ["drivers/staging/rtl8192e/rtl8192e/rtl_core.c", "_rtl92e_tx_timeout"], ["drivers/staging/rtl8192u/r8192U_core.c", "tx_timeout"], ["drivers/staging/unisys/visornic/visornic_main.c", "visornic_xmit_timeout"], ["drivers/staging/wlan-ng/p80211netdev.c", "p80211knetdev_tx_timeout"],
["drivers/tty/n_gsm.c", "gsm_mux_net_tx_timeout"],
["drivers/tty/synclink.c", "hdlcdev_tx_timeout"],
["drivers/tty/synclink_gt.c", "hdlcdev_tx_timeout"],
["drivers/tty/synclinkmp.c", "hdlcdev_tx_timeout"],
["net/atm/lec.c", "lec_tx_timeout"],
["net/bluetooth/bnep/netdev.c", "bnep_net_timeout"]
);
for my $p (@work) {
my @pair = @$p;
my $file = $pair[0];
my $func = $pair[1];
print STDERR $file , ": ", $func,"\n";
our @ARGV = ($file);
while (<ARGV>) {
if (m/($func\(struct\s+net_device\s+\*[A-Za-z_][A-Za-z-0-9]*)(\))/) {
print STDERR "found $1+$2 in $file\n";
}
if (s/($func\(struct\s+net_device\s+\*[A-Za-z_][A-Za-z-0-9]*)(\))/$1, int txqueue$2/) {
print STDERR "$func found in $file\n";
}
print;
}
}Result is at the bottom. If you like this approach, feel free to include as the 1st patch in your series.
Quoted 83 lines
Or we can keep the default
WARN_ONCE, but we need a minimum method implemented. We cannot get timeout directly because it needs to be implemented to get it directly.
Net core scheduler checks if this handler was implemented to throw a TX timeout. See:void __netdev_watchdog_up(struct net_device *dev) { if (dev->netdev_ops->ndo_tx_timeout) { if (dev->watchdog_timeo <= 0) dev->watchdog_timeo = 5*HZ; if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + dev->watchdog_timeo))) dev_hold(dev); } }Quoted 57 lines
Quoted 57 lines
drivers/net/virtio_net.c +42
-0+ +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; + + ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs);Quoted 8 lines
drivers/net/virtio_net.c static int virtnet_validate(struct virtio_device *vdev) · line 3061
Quoted 5 lines
drivers/net/virtio_net.c +5
-0+if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev);Is this enough? E.g. all RX mode programming has been lost.
Quoted 2 lines
IMHO virtio net has a nice performance. You can take days to see a TX timeout. If it is happening frequently, there is something wrong with device.
It is rather easy if you attach a debugger to qemu though ;)
Quoted 33 lines
So, again, IMHO I don't think it would be too problematic.
Quoted 24 lines
Quoted 24 lines
drivers/net/virtio_net.c +14
-0+return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ;Quoted 6 lines
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 3108
Quoted 4 lines
drivers/net/virtio_net.c +1
-0+ dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);Is there a way to make this tuneable from ethtool?
Quoted 3 lines
Yes and no.
You can do that obviously, but it is not a common field to tun. If you compare with other drivers.
Maybe we should just add a field specifying the timeout from the host. I'll ponder this over the weekend.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/virtio_net.c +1
-1@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || --2.17.1
--->
netdev: pass the stuck queue to the timeout handler
This allows incrementing the correct timeout statistic without any mess. Down the road, devices can learn to reset just the specific queue.
---
Warning: untested.
arch/m68k/emu/nfeth.c +1 -1
@@ -167,7 +167,7 @@ static int nfeth_xmit(struct sk_buff *skb, struct net_device *dev)return 0 ; } -static void nfeth_tx_timeout (struct net_device *dev) +static void nfeth_tx_timeout (struct net_device *dev,int txqueue) { dev->stats.tx_errors++;netif_wake_queue (dev);
arch/um/drivers/net_kern.c +1 -1
@@ -247,7 +247,7 @@ static void uml_net_set_multicast_list(struct net_device *dev)return ; } -static void uml_net_tx_timeout (struct net_device *dev) +static void uml_net_tx_timeout (struct net_device *dev,int txqueue) {netif_trans_update (dev);netif_wake_queue (dev);
arch/um/drivers/vector_kern.c +1 -1
@@ -1298,7 +1298,7 @@ static void vector_net_set_multicast_list(struct net_device *dev)return ; } -static void vector_net_tx_timeout (struct net_device *dev) +static void vector_net_tx_timeout (struct net_device *dev,int txqueue) {struct vector_private *vp =netdev_priv (dev);
arch/xtensa/platforms/iss/network.c +1 -1
@@ -455,7 +455,7 @@ static void iss_net_set_multicast_list(struct net_device *dev) { } -static void iss_net_tx_timeout (struct net_device *dev) +static void iss_net_tx_timeout (struct net_device *dev,int txqueue) { }
drivers/char/pcmcia/synclink_cs.c +1 -1
@@ -4169,7 +4169,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {MGSLPC_INFO *info =dev_to_port (dev);unsigned long flags;
drivers/infiniband/ulp/ipoib/ipoib_main.c +1 -1
@@ -1182,7 +1182,7 @@ static netdev_tx_t ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void ipoib_timeout (struct net_device *dev) +static void ipoib_timeout (struct net_device *dev,int txqueue) {struct ipoib_dev_priv *priv =ipoib_priv (dev);
drivers/message/fusion/mptlan.c +1 -1
@@ -552,7 +552,7 @@ mpt_lan_close(struct net_device *dev)/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* Tx timeout handler. */ static void -mpt_lan_tx_timeout (struct net_device *dev) +mpt_lan_tx_timeout (struct net_device *dev,int txqueue) {struct mpt_lan_priv *priv =netdev_priv (dev);MPT_ADAPTER *mpt_dev = priv->mpt_dev;
drivers/misc/sgi-xp/xpnet.c +1 -1
@@ -496,7 +496,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)* Deal with transmit timeouts coming from the network layer. */ static void -xpnet_dev_tx_timeout (struct net_device *dev) +xpnet_dev_tx_timeout (struct net_device *dev,int txqueue) { dev->stats.tx_errors++; }
drivers/net/appletalk/cops.c +2 -2
@@ -189,7 +189,7 @@ static int cops_nodeid (struct net_device *dev, int nodeid);static irqreturn_t cops_interrupt (int irq,void *dev_id);static void cops_poll (struct timer_list *t); -static void cops_timeout (struct net_device *dev); +static void cops_timeout (struct net_device *dev,int txqueue);static void cops_rx (struct net_device *dev);static netdev_tx_t cops_send_packet (struct sk_buff *skb,struct net_device *dev);
@@ -844,7 +844,7 @@ static void cops_rx(struct net_device *dev)netif_rx (skb); } -static void cops_timeout (struct net_device *dev) +static void cops_timeout (struct net_device *dev,int txqueue) {struct cops_local *lp =netdev_priv (dev);int ioaddr = dev->base_addr;
drivers/net/arcnet/arcnet.c +1 -1
@@ -763,7 +763,7 @@ static int go_tx(struct net_device *dev) }/* Called by the kernel when transmit times out */ -void arcnet_timeout (struct net_device *dev) +void arcnet_timeout (struct net_device *dev,int txqueue) {unsigned long flags;struct arcnet_local *lp =netdev_priv (dev);
drivers/net/ethernet/3com/3c515.c +2 -2
@@ -371,7 +371,7 @@ static void corkscrew_timer(struct timer_list *t);static netdev_tx_t corkscrew_start_xmit (struct sk_buff *skb,struct net_device *dev);static int corkscrew_rx (struct net_device *dev); -static void corkscrew_timeout (struct net_device *dev); +static void corkscrew_timeout (struct net_device *dev,int txqueue);static int boomerang_rx (struct net_device *dev);static irqreturn_t corkscrew_interrupt (int irq,void *dev_id);static int corkscrew_close (struct net_device *dev);
@@ -961,7 +961,7 @@ static void corkscrew_timer(struct timer_list *t)#endif /* AUTOMEDIA */ } -static void corkscrew_timeout (struct net_device *dev) +static void corkscrew_timeout (struct net_device *dev,int txqueue) {int i;struct corkscrew_private *vp =netdev_priv (dev);
drivers/net/ethernet/3com/3c574_cs.c +2 -2
@@ -234,7 +234,7 @@ static void update_stats(struct net_device *dev);static struct net_device_stats *el3_get_stats (struct net_device *dev);static int el3_rx (struct net_device *dev,int worklimit);static int el3_close (struct net_device *dev); -static void el3_tx_timeout (struct net_device *dev); +static void el3_tx_timeout (struct net_device *dev,int txqueue);static int el3_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void set_rx_mode (struct net_device *dev);static void set_multicast_list (struct net_device *dev);
@@ -690,7 +690,7 @@ static int el3_open(struct net_device *dev)return 0 ; } -static void el3_tx_timeout (struct net_device *dev) +static void el3_tx_timeout (struct net_device *dev,int txqueue) {unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/3com/3c589_cs.c +2 -2
@@ -173,7 +173,7 @@ static void update_stats(struct net_device *dev);static struct net_device_stats *el3_get_stats (struct net_device *dev);static int el3_rx (struct net_device *dev);static int el3_close (struct net_device *dev); -static void el3_tx_timeout (struct net_device *dev); +static void el3_tx_timeout (struct net_device *dev,int txqueue);static void set_rx_mode (struct net_device *dev);static void set_multicast_list (struct net_device *dev);static const struct ethtool_ops netdev_ethtool_ops;
@@ -526,7 +526,7 @@ static int el3_open(struct net_device *dev)return 0 ; } -static void el3_tx_timeout (struct net_device *dev) +static void el3_tx_timeout (struct net_device *dev,int txqueue) {unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/3com/3c59x.c +2 -2
@@ -776,7 +776,7 @@ static void set_rx_mode(struct net_device *dev);#ifdef CONFIG_PCI static int vortex_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);#endif -static void vortex_tx_timeout (struct net_device *dev); +static void vortex_tx_timeout (struct net_device *dev,int txqueue);static void acpi_set_WOL (struct net_device *dev);static const struct ethtool_ops vortex_ethtool_ops;static void set_8021q_mode (struct net_device *dev,int enable);
@@ -1877,7 +1877,7 @@ vortex_timer(struct timer_list *t)iowrite16 (FakeIntr, ioaddr +EL3_CMD ); } -static void vortex_tx_timeout (struct net_device *dev) +static void vortex_tx_timeout (struct net_device *dev,int txqueue) {struct vortex_private *vp =netdev_priv (dev);void __iomem *ioaddr = vp->ioaddr;
drivers/net/ethernet/3com/typhoon.c +1 -1
@@ -2013,7 +2013,7 @@ typhoon_stop_runtime(struct typhoon *tp, int wait_type) }static void -typhoon_tx_timeout (struct net_device *dev) +typhoon_tx_timeout (struct net_device *dev,int txqueue) {struct typhoon *tp =netdev_priv (dev);
drivers/net/ethernet/8390/8390.c +1 -1
@@ -36,7 +36,7 @@ void ei_set_multicast_list(struct net_device *dev) }EXPORT_SYMBOL (ei_set_multicast_list); -void ei_tx_timeout (struct net_device *dev) +void ei_tx_timeout (struct net_device *dev,int txqueue) {__ei_tx_timeout (dev); }
drivers/net/ethernet/8390/8390p.c +1 -1
@@ -41,7 +41,7 @@ void eip_set_multicast_list(struct net_device *dev) }EXPORT_SYMBOL (eip_set_multicast_list); -void eip_tx_timeout (struct net_device *dev) +void eip_tx_timeout (struct net_device *dev,int txqueue) {__ei_tx_timeout (dev); }
drivers/net/ethernet/8390/axnet_cs.c +2 -2
@@ -83,7 +83,7 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb, struct net_device *dev);static struct net_device_stats *get_stats (struct net_device *dev);static void set_multicast_list (struct net_device *dev); -static void axnet_tx_timeout (struct net_device *dev); +static void axnet_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t ei_irq_wrapper (int irq,void *dev_id);static void ei_watchdog (struct timer_list *t);static void axnet_reset_8390 (struct net_device *dev);
@@ -903,7 +903,7 @@ static int ax_close(struct net_device *dev)* completed (or failed) - i.e. never posted a Tx related interrupt. */ -static void axnet_tx_timeout (struct net_device *dev) +static void axnet_tx_timeout (struct net_device *dev,int txqueue) {long e8390_base = dev->base_addr;struct ei_device *ei_local =netdev_priv (dev);
drivers/net/ethernet/adaptec/starfire.c +2 -2
@@ -576,7 +576,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);static void mdio_write (struct net_device *dev,int phy_id,int location,int value);static int netdev_open (struct net_device *dev);static void check_duplex (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t intr_handler (int irq,void *dev_instance);
@@ -1105,7 +1105,7 @@ static void check_duplex(struct net_device *dev) } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base;
drivers/net/ethernet/agere/et131x.c +1 -1
@@ -3811,7 +3811,7 @@ static netdev_tx_t et131x_tx(struct sk_buff *skb, struct net_device *netdev)* specified by the 'tx_timeo" element in the net_device structure (see * et131x_alloc_device() to see how this value is set). */ -static void et131x_tx_timeout (struct net_device *netdev) +static void et131x_tx_timeout (struct net_device *netdev,int txqueue) {struct et131x_adapter *adapter =netdev_priv (netdev);struct tx_ring *tx_ring = &adapter->tx_ring;
drivers/net/ethernet/allwinner/sun4i-emac.c +1 -1
@@ -407,7 +407,7 @@ static void emac_init_device(struct net_device *dev) }/* Our watchdog timed out. Called by the networking layer */ -static void emac_timeout (struct net_device *dev) +static void emac_timeout (struct net_device *dev,int txqueue) {struct emac_board_info *db =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/alteon/acenic.c +2 -2
@@ -437,7 +437,7 @@ static const struct ethtool_ops ace_ethtool_ops = { .set_link_ksettings = ace_set_link_ksettings, }; -static void ace_watchdog (struct net_device *dev); +static void ace_watchdog (struct net_device *dev,int txqueue);static const struct net_device_ops ace_netdev_ops = { .ndo_open = ace_open,
@@ -1542,7 +1542,7 @@ static void ace_set_rxtx_parms(struct net_device *dev, int jumbo) } -static void ace_watchdog (struct net_device *data) +static void ace_watchdog (struct net_device *data,int txqueue) {struct net_device *dev = data;struct ace_private *ap =netdev_priv (dev);
drivers/net/ethernet/amazon/ena/ena_netdev.c +1 -1
@@ -78,7 +78,7 @@ static void check_for_admin_com_state(struct ena_adapter *adapter);static void ena_destroy_device (struct ena_adapter *adapter,bool graceful);static int ena_restore_device (struct ena_adapter *adapter); -static void ena_tx_timeout (struct net_device *dev) +static void ena_tx_timeout (struct net_device *dev,int txqueue) {struct ena_adapter *adapter =netdev_priv (dev);
drivers/net/ethernet/amd/a2065.c +1 -1
@@ -522,7 +522,7 @@ static inline int lance_reset(struct net_device *dev)return status; } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
drivers/net/ethernet/amd/am79c961a.c +1 -1
@@ -422,7 +422,7 @@ static void am79c961_setmulticastlist (struct net_device *dev)spin_unlock_irqrestore (&priv->chip_lock, flags); } -static void am79c961_timeout (struct net_device *dev) +static void am79c961_timeout (struct net_device *dev,int txqueue) {printk (KERN_WARNING "%s: transmit timed out, network cable problem?\n" , dev->name);
drivers/net/ethernet/amd/amd8111e.c +1 -1
@@ -1569,7 +1569,7 @@ static int amd8111e_enable_link_change(struct amd8111e_priv *lp)* failed or the interface is locked up. This function will reinitialize * the hardware. */ -static void amd8111e_tx_timeout (struct net_device *dev) +static void amd8111e_tx_timeout (struct net_device *dev,int txqueue) {struct amd8111e_priv *lp =netdev_priv (dev);int err;
drivers/net/ethernet/amd/ariadne.c +1 -1
@@ -530,7 +530,7 @@ static inline void ariadne_reset(struct net_device *dev)netif_start_queue (dev); } -static void ariadne_tx_timeout (struct net_device *dev) +static void ariadne_tx_timeout (struct net_device *dev,int txqueue) {volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr;
drivers/net/ethernet/amd/au1000_eth.c +1 -1
@@ -1014,7 +1014,7 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)* The Tx ring has been full longer than the watchdog timeout * value. The transmitter must be hung? */ -static void au1000_tx_timeout (struct net_device *dev) +static void au1000_tx_timeout (struct net_device *dev,int txqueue) {netdev_err (dev,"au1000_tx_timeout: dev=%p\n" , dev);au1000_reset_mac (dev);
drivers/net/ethernet/amd/declance.c +1 -1
@@ -884,7 +884,7 @@ static inline int lance_reset(struct net_device *dev)return status; } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;
drivers/net/ethernet/amd/ni65.c +2 -2
@@ -254,7 +254,7 @@ static int ni65_lance_reinit(struct net_device *dev);static void ni65_init_lance (struct priv *p,unsigned char *,int ,int );static netdev_tx_t ni65_send_packet (struct sk_buff *skb,struct net_device *dev); -static void ni65_timeout (struct net_device *dev); +static void ni65_timeout (struct net_device *dev,int txqueue);static int ni65_close (struct net_device *dev);static int ni65_alloc_buffer (struct net_device *dev);static void ni65_free_buffer (struct priv *p);
@@ -1133,7 +1133,7 @@ static void ni65_recv_intr(struct net_device *dev,int csr0)* kick xmitter .. */ -static void ni65_timeout (struct net_device *dev) +static void ni65_timeout (struct net_device *dev,int txqueue) {int i;struct priv *p = dev->ml_priv;
drivers/net/ethernet/amd/nmclan_cs.c +2 -2
@@ -407,7 +407,7 @@ static int mace_open(struct net_device *dev);static int mace_close (struct net_device *dev);static netdev_tx_t mace_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void mace_tx_timeout (struct net_device *dev); +static void mace_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t mace_interrupt (int irq,void *dev_id);static struct net_device_stats *mace_get_stats (struct net_device *dev);static int mace_rx (struct net_device *dev,unsigned char RxCnt);
@@ -837,7 +837,7 @@ mace_start_xmitfailed, put skb back into a list." ---------------------------------------------------------------------------- */ -static void mace_tx_timeout (struct net_device *dev) +static void mace_tx_timeout (struct net_device *dev,int txqueue) {mace_private *lp =netdev_priv (dev);struct pcmcia_device *link = lp->p_dev;
drivers/net/ethernet/amd/pcnet32.c +2 -2
@@ -314,7 +314,7 @@ static int pcnet32_open(struct net_device *);static int pcnet32_init_ring (struct net_device *);static netdev_tx_t pcnet32_start_xmit (struct sk_buff *,struct net_device *); -static void pcnet32_tx_timeout (struct net_device *dev); +static void pcnet32_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t pcnet32_interrupt (int ,void *);static int pcnet32_close (struct net_device *);static struct net_device_stats *pcnet32_get_stats (struct net_device *);
@@ -2455,7 +2455,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits) lp->a->write_csr (ioaddr,CSR0 , csr0_bits); } -static void pcnet32_tx_timeout (struct net_device *dev) +static void pcnet32_tx_timeout (struct net_device *dev,int txqueue) {struct pcnet32_private *lp =netdev_priv (dev);unsigned long ioaddr = dev->base_addr, flags;
drivers/net/ethernet/amd/sunlance.c +1 -1
@@ -1097,7 +1097,7 @@ static void lance_piozero(void __iomem *dest, int len)sbus_writeb (0 , piobuf); } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1 -1
@@ -2152,7 +2152,7 @@ static int xgbe_change_mtu(struct net_device *netdev, int mtu)return 0 ; } -static void xgbe_tx_timeout (struct net_device *netdev) +static void xgbe_tx_timeout (struct net_device *netdev,int txqueue) {struct xgbe_prv_data *pdata =netdev_priv (netdev);
drivers/net/ethernet/apm/xgene-v2/main.c +1 -1
@@ -575,7 +575,7 @@ static void xge_free_pending_skb(struct net_device *ndev) } } -static void xge_timeout (struct net_device *ndev) +static void xge_timeout (struct net_device *ndev,int txqueue) {struct xge_pdata *pdata =netdev_priv (ndev);
drivers/net/ethernet/apm/xgene/xgene_enet_main.c +1 -1
@@ -859,7 +859,7 @@ static int xgene_enet_napi(struct napi_struct *napi, const int budget)return processed; } -static void xgene_enet_timeout (struct net_device *ndev) +static void xgene_enet_timeout (struct net_device *ndev,int txqueue) {struct xgene_enet_pdata *pdata =netdev_priv (ndev);struct netdev_queue *txq;
drivers/net/ethernet/apple/macmace.c +2 -2
@@ -91,7 +91,7 @@ static int mace_set_address(struct net_device *dev, void *addr);static void mace_reset (struct net_device *dev);static irqreturn_t mace_interrupt (int irq,void *dev_id);static irqreturn_t mace_dma_intr (int irq,void *dev_id); -static void mace_tx_timeout (struct net_device *dev); +static void mace_tx_timeout (struct net_device *dev,int txqueue);static void __mace_set_address (struct net_device *dev,void *addr);/*
@@ -600,7 +600,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static void mace_tx_timeout (struct net_device *dev) +static void mace_tx_timeout (struct net_device *dev,int txqueue) {struct mace_data *mp =netdev_priv (dev);volatile struct mace *mb = mp->mace;
drivers/net/ethernet/atheros/ag71xx.c +1 -1
@@ -1409,7 +1409,7 @@ static void ag71xx_oom_timer_handler(struct timer_list *t)napi_schedule (&ag->napi); } -static void ag71xx_tx_timeout (struct net_device *ndev) +static void ag71xx_tx_timeout (struct net_device *ndev,int txqueue) {struct ag71xx *ag =netdev_priv (ndev);
drivers/net/ethernet/atheros/alx/main.c +1 -1
@@ -1553,7 +1553,7 @@ static netdev_tx_t alx_start_xmit(struct sk_buff *skb,return alx_start_xmit_ring (skb,alx_tx_queue_mapping (alx, skb)); } -static void alx_tx_timeout (struct net_device *dev) +static void alx_tx_timeout (struct net_device *dev,int txqueue) {struct alx_priv *alx =netdev_priv (dev);
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1 -1
@@ -350,7 +350,7 @@ static void atl1c_del_timer(struct atl1c_adapter *adapter)* atl1c_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl1c_tx_timeout (struct net_device *netdev) +static void atl1c_tx_timeout (struct net_device *netdev,int txqueue) {struct atl1c_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/atheros/atl1e/atl1e_main.c +1 -1
@@ -251,7 +251,7 @@ static void atl1e_cancel_work(struct atl1e_adapter *adapter)* atl1e_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl1e_tx_timeout (struct net_device *netdev) +static void atl1e_tx_timeout (struct net_device *netdev,int txqueue) {struct atl1e_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/atheros/atlx/atl2.c +1 -1
@@ -1001,7 +1001,7 @@ static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)* atl2_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl2_tx_timeout (struct net_device *netdev) +static void atl2_tx_timeout (struct net_device *netdev,int txqueue) {struct atl2_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/broadcom/b44.c +1 -1
@@ -951,7 +951,7 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id)return IRQ_RETVAL (handled); } -static void b44_tx_timeout (struct net_device *dev) +static void b44_tx_timeout (struct net_device *dev,int txqueue) {struct b44 *bp =netdev_priv (dev);
drivers/net/ethernet/broadcom/bcmsysport.c +1 -1
@@ -1354,7 +1354,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,return ret; } -static void bcm_sysport_tx_timeout (struct net_device *dev) +static void bcm_sysport_tx_timeout (struct net_device *dev,int txqueue) {netdev_warn (dev,"transmit timeout!\n" );
drivers/net/ethernet/broadcom/bnx2.c +1 -1
@@ -6575,7 +6575,7 @@ bnx2_dump_state(struct bnx2 *bp) }static void -bnx2_tx_timeout (struct net_device *dev) +bnx2_tx_timeout (struct net_device *dev,int txqueue) {struct bnx2 *bp =netdev_priv (dev);
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -1
@@ -9936,7 +9936,7 @@ static void bnxt_reset_task(struct bnxt *bp, bool silent) } } -static void bnxt_tx_timeout (struct net_device *dev) +static void bnxt_tx_timeout (struct net_device *dev,int txqueue) {struct bnxt *bp =netdev_priv (dev);
drivers/net/ethernet/broadcom/genet/bcmgenet.c +1 -1
@@ -3053,7 +3053,7 @@ static void bcmgenet_dump_tx_queue(struct bcmgenet_tx_ring *ring) ring->cb_ptr, ring->end_ptr); } -static void bcmgenet_timeout (struct net_device *dev) +static void bcmgenet_timeout (struct net_device *dev,int txqueue) {struct bcmgenet_priv *priv =netdev_priv (dev);u32 int0_enable =0 ;
drivers/net/ethernet/broadcom/tg3.c +1 -1
@@ -7645,7 +7645,7 @@ static void tg3_poll_controller(struct net_device *dev) }#endif -static void tg3_tx_timeout (struct net_device *dev) +static void tg3_tx_timeout (struct net_device *dev,int txqueue) {struct tg3 *tp =netdev_priv (dev);
drivers/net/ethernet/calxeda/xgmac.c +1 -1
@@ -1251,7 +1251,7 @@ static int xgmac_poll(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void xgmac_tx_timeout (struct net_device *dev) +static void xgmac_tx_timeout (struct net_device *dev,int txqueue) {struct xgmac_priv *priv =netdev_priv (dev);schedule_work (&priv->tx_timeout_work);
drivers/net/ethernet/cavium/liquidio/lio_main.c +1 -1
@@ -2562,7 +2562,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)/** \brief Network device Tx timeout * @param netdev pointer to network device */ -static void liquidio_tx_timeout (struct net_device *netdev) +static void liquidio_tx_timeout (struct net_device *netdev,int txqueue) {struct lio *lio;
drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +1 -1
@@ -1628,7 +1628,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)/** \brief Network device Tx timeout * @param netdev pointer to network device */ -static void liquidio_tx_timeout (struct net_device *netdev) +static void liquidio_tx_timeout (struct net_device *netdev,int txqueue) {struct lio *lio;
drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +2 -2
@@ -31,7 +31,7 @@ static int lio_vf_rep_open(struct net_device *ndev);static int lio_vf_rep_stop (struct net_device *ndev);static netdev_tx_t lio_vf_rep_pkt_xmit (struct sk_buff *skb,struct net_device *ndev); -static void lio_vf_rep_tx_timeout (struct net_device *netdev); +static void lio_vf_rep_tx_timeout (struct net_device *netdev,int txqueue);static int lio_vf_rep_phys_port_name (struct net_device *dev,char *buf,size_t len); static void lio_vf_rep_get_stats64(struct net_device *dev,
@@ -172,7 +172,7 @@ lio_vf_rep_stop(struct net_device *ndev) }static void -lio_vf_rep_tx_timeout (struct net_device *ndev) +lio_vf_rep_tx_timeout (struct net_device *ndev,int txqueue) {netif_trans_update (ndev);
drivers/net/ethernet/cavium/thunder/nicvf_main.c +1 -1
@@ -1741,7 +1741,7 @@ static void nicvf_get_stats64(struct net_device *netdev, } -static void nicvf_tx_timeout (struct net_device *dev) +static void nicvf_tx_timeout (struct net_device *dev,int txqueue) {struct nicvf *nic =netdev_priv (dev);
drivers/net/ethernet/cirrus/cs89x0.c +1 -1
@@ -1128,7 +1128,7 @@ net_get_stats(struct net_device *dev)return &dev->stats; } -static void net_timeout (struct net_device *dev) +static void net_timeout (struct net_device *dev,int txqueue) {/* If we get here, some higher level has decided we are broken. There should really be a "kick me" function call instead. */
drivers/net/ethernet/cisco/enic/enic_main.c +1 -1
@@ -1095,7 +1095,7 @@ static void enic_set_rx_mode(struct net_device *netdev) }/* netif_tx_lock held, BHs disabled */ -static void enic_tx_timeout (struct net_device *netdev) +static void enic_tx_timeout (struct net_device *netdev,int txqueue) {struct enic *enic =netdev_priv (netdev);schedule_work (&enic->tx_hang_reset);
drivers/net/ethernet/cortina/gemini.c +1 -1
@@ -1296,7 +1296,7 @@ static int gmac_start_xmit(struct sk_buff *skb, struct net_device *netdev)return NETDEV_TX_OK ; } -static void gmac_tx_timeout (struct net_device *netdev) +static void gmac_tx_timeout (struct net_device *netdev,int txqueue) {netdev_err (netdev,"Tx timeout\n" );gmac_dump_dma_state (netdev);
drivers/net/ethernet/davicom/dm9000.c +1 -1
@@ -964,7 +964,7 @@ dm9000_init_dm9000(struct net_device *dev) }/* Our watchdog timed out. Called by the networking layer */ -static void dm9000_timeout (struct net_device *dev) +static void dm9000_timeout (struct net_device *dev,int txqueue) {struct board_info *db =netdev_priv (dev);u8 reg_save;
drivers/net/ethernet/dec/tulip/tulip_core.c +2 -2
@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(pci, tulip_pci_tbl);const char tulip_media_cap[32 ] = {0 ,0 ,0 ,16 ,3 ,19 ,16 ,24 ,27 ,4 ,7 ,5 ,0 ,20 ,23 ,20 ,28 ,31 ,0 ,0 , }; -static void tulip_tx_timeout (struct net_device *dev); +static void tulip_tx_timeout (struct net_device *dev,int txqueue);static void tulip_init_ring (struct net_device *dev);static void tulip_free_ring (struct net_device *dev); static netdev_tx_t tulip_start_xmit(struct sk_buff *skb,
@@ -534,7 +534,7 @@ tulip_open(struct net_device *dev) } -static void tulip_tx_timeout (struct net_device *dev) +static void tulip_tx_timeout (struct net_device *dev,int txqueue) {struct tulip_private *tp =netdev_priv (dev);void __iomem *ioaddr = tp->base_addr;
drivers/net/ethernet/dec/tulip/winbond-840.c +2 -2
@@ -331,7 +331,7 @@ static void netdev_timer(struct timer_list *t);static void init_rxtx_rings (struct net_device *dev);static void free_rxtx_rings (struct netdev_private *np);static void init_registers (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static int alloc_ringdesc (struct net_device *dev);static void free_ringdesc (struct netdev_private *np);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);
@@ -921,7 +921,7 @@ static void init_registers(struct net_device *dev)iowrite32 (0 , ioaddr + RxStartDemand); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base_addr;
drivers/net/ethernet/dlink/sundance.c +2 -2
@@ -432,7 +432,7 @@ static int mdio_wait_link(struct net_device *dev, int wait);static int netdev_open (struct net_device *dev);static void check_duplex (struct net_device *dev);static void netdev_timer (struct timer_list *t); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static int reset_tx (struct net_device *dev);
@@ -969,7 +969,7 @@ static void netdev_timer(struct timer_list *t)add_timer (&np->timer); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base;
drivers/net/ethernet/emulex/benet/be_main.c +1 -1
@@ -1417,7 +1417,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)return NETDEV_TX_OK ; } -static void be_tx_timeout (struct net_device *netdev) +static void be_tx_timeout (struct net_device *netdev,int txqueue) {struct be_adapter *adapter =netdev_priv (netdev);struct device *dev = &adapter->pdev->dev;
drivers/net/ethernet/ethoc.c +1 -1
@@ -869,7 +869,7 @@ static int ethoc_change_mtu(struct net_device *dev, int new_mtu)return -ENOSYS ; } -static void ethoc_tx_timeout (struct net_device *dev) +static void ethoc_tx_timeout (struct net_device *dev,int txqueue) {struct ethoc *priv =netdev_priv (dev);u32 pending =ethoc_read (priv,INT_SOURCE );
drivers/net/ethernet/faraday/ftgmac100.c +1 -1
@@ -1542,7 +1542,7 @@ static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, intreturn phy_mii_ioctl (netdev->phydev, ifr, cmd); } -static void ftgmac100_tx_timeout (struct net_device *netdev) +static void ftgmac100_tx_timeout (struct net_device *netdev,int txqueue) {struct ftgmac100 *priv =netdev_priv (netdev);
drivers/net/ethernet/fealnx.c +2 -2
@@ -428,7 +428,7 @@ static void getlinktype(struct net_device *dev);static void getlinkstatus (struct net_device *dev);static void netdev_timer (struct timer_list *t);static void reset_timer (struct timer_list *t); -static void fealnx_tx_timeout (struct net_device *dev); +static void fealnx_tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t intr_handler (int irq,void *dev_instance);
@@ -1191,7 +1191,7 @@ static void reset_timer(struct timer_list *t) } -static void fealnx_tx_timeout (struct net_device *dev) +static void fealnx_tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->mem;
drivers/net/ethernet/freescale/fec_main.c +1 -1
@@ -1141,7 +1141,7 @@ fec_stop(struct net_device *ndev)static void -fec_timeout (struct net_device *ndev) +fec_timeout (struct net_device *ndev,int txqueue) {struct fec_enet_private *fep =netdev_priv (ndev);
drivers/net/ethernet/freescale/fec_mpc52xx.c +1 -1
@@ -84,7 +84,7 @@ static int debug = -1; /* the above default */module_param (debug, int,0 );MODULE_PARM_DESC (debug,"debugging messages level" ); -static void mpc52xx_fec_tx_timeout (struct net_device *dev) +static void mpc52xx_fec_tx_timeout (struct net_device *dev,int txqueue) {struct mpc52xx_fec_priv *priv =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1 -1
@@ -641,7 +641,7 @@ static void fs_timeout_work(struct work_struct *work)netif_wake_queue (dev); } -static void fs_timeout (struct net_device *dev) +static void fs_timeout (struct net_device *dev,int txqueue) {struct fs_enet_private *fep =netdev_priv (dev);
drivers/net/ethernet/freescale/gianfar.c +1 -1
@@ -2092,7 +2092,7 @@ static void gfar_reset_task(struct work_struct *work)reset_gfar (priv->ndev); } -static void gfar_timeout (struct net_device *dev) +static void gfar_timeout (struct net_device *dev,int txqueue) {struct gfar_private *priv =netdev_priv (dev);
drivers/net/ethernet/freescale/ucc_geth.c +1 -1
@@ -3545,7 +3545,7 @@ static void ucc_geth_timeout_work(struct work_struct *work)* ucc_geth_timeout gets called when a packet has not been * transmitted after a set amount of time. */ -static void ucc_geth_timeout (struct net_device *dev) +static void ucc_geth_timeout (struct net_device *dev,int txqueue) {struct ucc_geth_private *ugeth =netdev_priv (dev);
drivers/net/ethernet/fujitsu/fmvj18x_cs.c +2 -2
@@ -93,7 +93,7 @@ static irqreturn_t fjn_interrupt(int irq, void *dev_id);static void fjn_rx (struct net_device *dev);static void fjn_reset (struct net_device *dev);static void set_rx_mode (struct net_device *dev); -static void fjn_tx_timeout (struct net_device *dev); +static void fjn_tx_timeout (struct net_device *dev,int txqueue);static const struct ethtool_ops netdev_ethtool_ops;/*
@@ -774,7 +774,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id)/*====================================================================*/ -static void fjn_tx_timeout (struct net_device *dev) +static void fjn_tx_timeout (struct net_device *dev,int txqueue) {struct local_info *lp =netdev_priv (dev);unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/google/gve/gve_main.c +1 -1
@@ -844,7 +844,7 @@ static void gve_turnup(struct gve_priv *priv)gve_set_napi_enabled (priv); } -static void gve_tx_timeout (struct net_device *dev) +static void gve_tx_timeout (struct net_device *dev,int txqueue) {struct gve_priv *priv =netdev_priv (dev);
drivers/net/ethernet/hisilicon/hip04_eth.c +1 -1
@@ -779,7 +779,7 @@ static int hip04_mac_stop(struct net_device *ndev)return 0 ; } -static void hip04_timeout (struct net_device *ndev) +static void hip04_timeout (struct net_device *ndev,int txqueue) {struct hip04_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +1 -1
@@ -893,7 +893,7 @@ static void hix5hd2_tx_timeout_task(struct work_struct *work)hix5hd2_net_open (priv->netdev); } -static void hix5hd2_net_timeout (struct net_device *dev) +static void hix5hd2_net_timeout (struct net_device *dev,int txqueue) {struct hix5hd2_priv *priv =netdev_priv (dev);
drivers/net/ethernet/hisilicon/hns/hns_enet.c +1 -1
@@ -1485,7 +1485,7 @@ static int hns_nic_net_stop(struct net_device *ndev)static void hns_tx_timeout_reset (struct hns_nic_priv *priv);#define HNS_TX_TIMEO_LIMIT (40 * HZ) -static void hns_nic_net_timeout (struct net_device *ndev) +static void hns_nic_net_timeout (struct net_device *ndev,int txqueue) {struct hns_nic_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1 -1
@@ -1764,7 +1764,7 @@ static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev)return true; } -static void hns3_nic_net_timeout (struct net_device *ndev) +static void hns3_nic_net_timeout (struct net_device *ndev,int txqueue) {struct hns3_nic_priv *priv =netdev_priv (ndev);struct hnae3_handle *h = priv->ae_handle;
drivers/net/ethernet/huawei/hinic/hinic_main.c +1 -1
@@ -766,7 +766,7 @@ static void hinic_set_rx_mode(struct net_device *netdev)queue_work (nic_dev->workq, &rx_mode_work->work); } -static void hinic_tx_timeout (struct net_device *netdev) +static void hinic_tx_timeout (struct net_device *netdev,int txqueue) {struct hinic_dev *nic_dev =netdev_priv (netdev);
drivers/net/ethernet/i825xx/ether1.c +2 -2
@@ -66,7 +66,7 @@ static netdev_tx_t ether1_sendpacket(struct sk_buff *skb,static irqreturn_t ether1_interrupt (int irq,void *dev_id);static int ether1_close (struct net_device *dev);static void ether1_setmulticastlist (struct net_device *dev); -static void ether1_timeout (struct net_device *dev); +static void ether1_timeout (struct net_device *dev,int txqueue);/* ------------------------------------------------------------------------- */
@@ -650,7 +650,7 @@ ether1_open (struct net_device *dev) }static void -ether1_timeout (struct net_device *dev) +ether1_timeout (struct net_device *dev,int txqueue) {printk (KERN_WARNING "%s: transmit timeout, network cable problem?\n" , dev->name);
drivers/net/ethernet/i825xx/sun3_82586.c +2 -2
@@ -125,7 +125,7 @@ static netdev_tx_t sun3_82586_send_packet(struct sk_buff *, struct net_device *);static struct net_device_stats *sun3_82586_get_stats (struct net_device *dev);static void set_multicast_list (struct net_device *dev); -static void sun3_82586_timeout (struct net_device *dev); +static void sun3_82586_timeout (struct net_device *dev,int txqueue);#if 0 static void sun3_82586_dump (struct net_device *,void *);#endif
@@ -965,7 +965,7 @@ static void startrecv586(struct net_device *dev)WAIT_4_SCB_CMD_RUC ();/* wait for accept cmd. (no timeout!!) */ } -static void sun3_82586_timeout (struct net_device *dev) +static void sun3_82586_timeout (struct net_device *dev,int txqueue) {struct priv *p =netdev_priv (dev);#ifndef NO_NOPCOMMANDS
drivers/net/ethernet/ibm/ehea/ehea_main.c +1 -1
@@ -2786,7 +2786,7 @@ static void ehea_rereg_mrs(void)return ; } -static void ehea_tx_watchdog (struct net_device *dev) +static void ehea_tx_watchdog (struct net_device *dev,int txqueue) {struct ehea_port *port =netdev_priv (dev);
drivers/net/ethernet/ibm/emac/core.c +1 -1
@@ -776,7 +776,7 @@ static void emac_reset_work(struct work_struct *work)mutex_unlock (&dev->link_lock); } -static void emac_tx_timeout (struct net_device *ndev) +static void emac_tx_timeout (struct net_device *ndev,int txqueue) {struct emac_instance *dev =netdev_priv (ndev);
drivers/net/ethernet/ibm/ibmvnic.c +1 -1
@@ -2189,7 +2189,7 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,return -ret; } -static void ibmvnic_tx_timeout (struct net_device *dev) +static void ibmvnic_tx_timeout (struct net_device *dev,int txqueue) {struct ibmvnic_adapter *adapter =netdev_priv (dev);
drivers/net/ethernet/intel/e100.c +1 -1
@@ -2316,7 +2316,7 @@ static void e100_down(struct nic *nic)e100_rx_clean_list (nic); } -static void e100_tx_timeout (struct net_device *netdev) +static void e100_tx_timeout (struct net_device *netdev,int txqueue) {struct nic *nic =netdev_priv (netdev);
drivers/net/ethernet/intel/e1000/e1000_main.c +2 -2
@@ -134,7 +134,7 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);static void e1000_enter_82542_rst (struct e1000_adapter *adapter);static void e1000_leave_82542_rst (struct e1000_adapter *adapter); -static void e1000_tx_timeout (struct net_device *dev); +static void e1000_tx_timeout (struct net_device *dev,int txqueue);static void e1000_reset_task (struct work_struct *work);static void e1000_smartspeed (struct e1000_adapter *adapter); static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,
@@ -3488,7 +3488,7 @@ static void e1000_dump(struct e1000_adapter *adapter)* e1000_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void e1000_tx_timeout (struct net_device *netdev) +static void e1000_tx_timeout (struct net_device *netdev,int txqueue) {struct e1000_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/e1000e/netdev.c +1 -1
@@ -5926,7 +5926,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,* e1000_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void e1000_tx_timeout (struct net_device *netdev) +static void e1000_tx_timeout (struct net_device *netdev,int txqueue) {struct e1000_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +1 -1
@@ -697,7 +697,7 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)* fm10k_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void fm10k_tx_timeout (struct net_device *netdev) +static void fm10k_tx_timeout (struct net_device *netdev,int txqueue) {struct fm10k_intfc *interface =netdev_priv (netdev);bool real_tx_hang = false;
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -1
@@ -301,7 +301,7 @@ void i40e_service_event_schedule(struct i40e_pf *pf)* device is munged, not just the one netdev port, so go for the full * reset. **/ -static void i40e_tx_timeout (struct net_device *netdev) +static void i40e_tx_timeout (struct net_device *netdev,int txqueue) {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_vsi *vsi = np->vsi;
drivers/net/ethernet/intel/iavf/iavf_main.c +1 -1
@@ -159,7 +159,7 @@ void iavf_schedule_reset(struct iavf_adapter *adapter)* iavf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void iavf_tx_timeout (struct net_device *netdev) +static void iavf_tx_timeout (struct net_device *netdev,int txqueue) {struct iavf_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ice/ice_main.c +1 -1
@@ -4627,7 +4627,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,* ice_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void ice_tx_timeout (struct net_device *netdev) +static void ice_tx_timeout (struct net_device *netdev,int txqueue) {struct ice_netdev_priv *np =netdev_priv (netdev);struct ice_ring *tx_ring =NULL ;
drivers/net/ethernet/intel/igb/igb_main.c +1 -1
@@ -6173,7 +6173,7 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *skb,* igb_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void igb_tx_timeout (struct net_device *netdev) +static void igb_tx_timeout (struct net_device *netdev,int txqueue) {struct igb_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;
drivers/net/ethernet/intel/igbvf/netdev.c +1 -1
@@ -2375,7 +2375,7 @@ static netdev_tx_t igbvf_xmit_frame(struct sk_buff *skb,* igbvf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void igbvf_tx_timeout (struct net_device *netdev) +static void igbvf_tx_timeout (struct net_device *netdev,int txqueue) {struct igbvf_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ixgb/ixgb_main.c +2 -2
@@ -70,7 +70,7 @@ static int ixgb_clean(struct napi_struct *, int);static bool ixgb_clean_rx_irq (struct ixgb_adapter *,int *,int );static void ixgb_alloc_rx_buffers (struct ixgb_adapter *,int ); -static void ixgb_tx_timeout (struct net_device *dev); +static void ixgb_tx_timeout (struct net_device *dev,int txqueue);static void ixgb_tx_timeout_task (struct work_struct *work);static void ixgb_vlan_strip_enable (struct ixgb_adapter *adapter);
@@ -1538,7 +1538,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)**/ static void -ixgb_tx_timeout (struct net_device *netdev) +ixgb_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgb_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c +1 -1
@@ -166,7 +166,7 @@ static ssize_t ixgbe_dbg_netdev_ops_write(struct file *filp, ixgbe_dbg_netdev_ops_buf[len] ='\0' ;if (strncmp (ixgbe_dbg_netdev_ops_buf,"tx_timeout" ,10 ) ==0 ) { - adapter->netdev->netdev_ops->ndo_tx_timeout (adapter->netdev); + adapter->netdev->netdev_ops->ndo_tx_timeout (adapter->netdev,-1 );e_dev_info ("tx_timeout called\n" ); }else {e_dev_info ("Unknown command: %s\n" , ixgbe_dbg_netdev_ops_buf);
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1 -1
@@ -6158,7 +6158,7 @@ static void ixgbe_set_eee_capable(struct ixgbe_adapter *adapter)* ixgbe_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void ixgbe_tx_timeout (struct net_device *netdev) +static void ixgbe_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgbe_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1 -1
@@ -250,7 +250,7 @@ static void ixgbevf_tx_timeout_reset(struct ixgbevf_adapter *adapter)* ixgbevf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void ixgbevf_tx_timeout (struct net_device *netdev) +static void ixgbevf_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgbevf_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/jme.c +1 -1
@@ -2337,7 +2337,7 @@ jme_change_mtu(struct net_device *netdev, int new_mtu) }static void -jme_tx_timeout (struct net_device *netdev) +jme_tx_timeout (struct net_device *netdev,int txqueue) {struct jme_adapter *jme =netdev_priv (netdev);
drivers/net/ethernet/korina.c +1 -1
@@ -917,7 +917,7 @@ static void korina_restart_task(struct work_struct *work)enable_irq (lp->rx_irq); } -static void korina_tx_timeout (struct net_device *dev) +static void korina_tx_timeout (struct net_device *dev,int txqueue) {struct korina_private *lp =netdev_priv (dev);
drivers/net/ethernet/lantiq_etop.c +1 -1
@@ -594,7 +594,7 @@ ltq_etop_init(struct net_device *dev) }static void -ltq_etop_tx_timeout (struct net_device *dev) +ltq_etop_tx_timeout (struct net_device *dev,int txqueue) {int err;
drivers/net/ethernet/marvell/mv643xx_eth.c +1 -1
@@ -2590,7 +2590,7 @@ static void tx_timeout_task(struct work_struct *ugly) } } -static void mv643xx_eth_tx_timeout (struct net_device *dev) +static void mv643xx_eth_tx_timeout (struct net_device *dev,int txqueue) {struct mv643xx_eth_private *mp =netdev_priv (dev);
drivers/net/ethernet/marvell/pxa168_eth.c +1 -1
@@ -742,7 +742,7 @@ static int txq_reclaim(struct net_device *dev, int force)return released; } -static void pxa168_eth_tx_timeout (struct net_device *dev) +static void pxa168_eth_tx_timeout (struct net_device *dev,int txqueue) {struct pxa168_eth_private *pep =netdev_priv (dev);
drivers/net/ethernet/marvell/skge.c +1 -1
@@ -2884,7 +2884,7 @@ static void skge_tx_clean(struct net_device *dev) skge->tx_ring.to_clean = e; } -static void skge_tx_timeout (struct net_device *dev) +static void skge_tx_timeout (struct net_device *dev,int txqueue) {struct skge_port *skge =netdev_priv (dev);
drivers/net/ethernet/marvell/sky2.c +1 -1
@@ -2358,7 +2358,7 @@ static void sky2_qlink_intr(struct sky2_hw *hw)/* Transmit timeout is only called if we are running, carrier is up * and tx queue is full (stopped). */ -static void sky2_tx_timeout (struct net_device *dev) +static void sky2_tx_timeout (struct net_device *dev,int txqueue) {struct sky2_port *sky2 =netdev_priv (dev);struct sky2_hw *hw = sky2->hw;
drivers/net/ethernet/mediatek/mtk_eth_soc.c +1 -1
@@ -2083,7 +2083,7 @@ static void mtk_dma_free(struct mtk_eth *eth)kfree (eth->scratch_head); } -static void mtk_tx_timeout (struct net_device *dev) +static void mtk_tx_timeout (struct net_device *dev,int txqueue) {struct mtk_mac *mac =netdev_priv (dev);struct mtk_eth *eth = mac->hw;
drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1 -1
@@ -1354,7 +1354,7 @@ static void mlx4_en_delete_rss_steer_rules(struct mlx4_en_priv *priv) } } -static void mlx4_en_tx_timeout (struct net_device *dev) +static void mlx4_en_tx_timeout (struct net_device *dev,int txqueue) {struct mlx4_en_priv *priv =netdev_priv (dev);struct mlx4_en_dev *mdev = priv->mdev;
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -1
@@ -4337,7 +4337,7 @@ static void mlx5e_tx_timeout_work(struct work_struct *work)rtnl_unlock (); } -static void mlx5e_tx_timeout (struct net_device *dev) +static void mlx5e_tx_timeout (struct net_device *dev,int txqueue) {struct mlx5e_priv *priv =netdev_priv (dev);
drivers/net/ethernet/micrel/ks8842.c +1 -1
@@ -1103,7 +1103,7 @@ static void ks8842_tx_timeout_work(struct work_struct *work)__ks8842_start_new_rx_dma (netdev); } -static void ks8842_tx_timeout (struct net_device *netdev) +static void ks8842_tx_timeout (struct net_device *netdev,int txqueue) {struct ks8842_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/micrel/ksz884x.c +1 -1
@@ -4896,7 +4896,7 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)* triggered to free up resources so that the transmit routine can continue * sending out packets. The hardware is reset to correct the problem. */ -static void netdev_tx_timeout (struct net_device *dev) +static void netdev_tx_timeout (struct net_device *dev,int txqueue) {static unsigned long last_reset;
drivers/net/ethernet/microchip/enc28j60.c +1 -1
@@ -1325,7 +1325,7 @@ static irqreturn_t enc28j60_irq(int irq, void *dev_id)return IRQ_HANDLED ; } -static void enc28j60_tx_timeout (struct net_device *ndev) +static void enc28j60_tx_timeout (struct net_device *ndev,int txqueue) {struct enc28j60_net *priv =netdev_priv (ndev);
drivers/net/ethernet/microchip/encx24j600.c +1 -1
@@ -892,7 +892,7 @@ static netdev_tx_t encx24j600_tx(struct sk_buff *skb, struct net_device *dev) }/* Deal with a transmit timeout */ -static void encx24j600_tx_timeout (struct net_device *dev) +static void encx24j600_tx_timeout (struct net_device *dev,int txqueue) {struct encx24j600_priv *priv =netdev_priv (dev);
drivers/net/ethernet/natsemi/natsemi.c +2 -2
@@ -612,7 +612,7 @@ static void undo_cable_magic(struct net_device *dev);static void check_link (struct net_device *dev);static void netdev_timer (struct timer_list *t);static void dump_ring (struct net_device *dev); -static void ns_tx_timeout (struct net_device *dev); +static void ns_tx_timeout (struct net_device *dev,int txqueue);static int alloc_ring (struct net_device *dev);static void refill_rx (struct net_device *dev);static void init_ring (struct net_device *dev);
@@ -1881,7 +1881,7 @@ static void dump_ring(struct net_device *dev) } } -static void ns_tx_timeout (struct net_device *dev) +static void ns_tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem * ioaddr =ns_ioaddr (dev);
drivers/net/ethernet/natsemi/ns83820.c +1 -1
@@ -1549,7 +1549,7 @@ static int ns83820_stop(struct net_device *ndev)return 0 ; } -static void ns83820_tx_timeout (struct net_device *ndev) +static void ns83820_tx_timeout (struct net_device *ndev,int txqueue) {struct ns83820 *dev =PRIV (ndev);u32 tx_done_idx;
drivers/net/ethernet/neterion/s2io.c +1 -1
@@ -7238,7 +7238,7 @@ static void s2io_restart_nic(struct work_struct *work)* void */ -static void s2io_tx_watchdog (struct net_device *dev) +static void s2io_tx_watchdog (struct net_device *dev,int txqueue) {struct s2io_nic *sp =netdev_priv (dev);struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;
drivers/net/ethernet/neterion/vxge/vxge-main.c +1 -1
@@ -3273,7 +3273,7 @@ static int vxge_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)* This function is triggered if the Tx Queue is stopped * for a pre-defined amount of time when the Interface is still up. */ -static void vxge_tx_watchdog (struct net_device *dev) +static void vxge_tx_watchdog (struct net_device *dev,int txqueue) {struct vxgedev *vdev;
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +1 -1
@@ -1320,7 +1320,7 @@ nfp_net_tx_ring_reset(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring)netdev_tx_reset_queue (nd_q); } -static void nfp_net_tx_timeout (struct net_device *netdev) +static void nfp_net_tx_timeout (struct net_device *netdev,int txqueue) {struct nfp_net *nn =netdev_priv (netdev);int i;
drivers/net/ethernet/nvidia/forcedeth.c +1 -1
@@ -2700,7 +2700,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)* nv_tx_timeout: dev->tx_timeout function * Called with netif_tx_lock held. */ -static void nv_tx_timeout (struct net_device *dev) +static void nv_tx_timeout (struct net_device *dev,int txqueue) {struct fe_priv *np =netdev_priv (dev);u8 __iomem *base =get_hwbase (dev);
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +1 -1
@@ -2271,7 +2271,7 @@ static int pch_gbe_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)* pch_gbe_tx_timeout - Respond to a Tx Hang * @netdev: Network interface device structure */ -static void pch_gbe_tx_timeout (struct net_device *netdev) +static void pch_gbe_tx_timeout (struct net_device *netdev,int txqueue) {struct pch_gbe_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/packetengines/hamachi.c +2 -2
@@ -548,7 +548,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int valstatic int hamachi_open (struct net_device *dev);static int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void hamachi_timer (struct timer_list *t); -static void hamachi_tx_timeout (struct net_device *dev); +static void hamachi_tx_timeout (struct net_device *dev,int txqueue);static void hamachi_init_ring (struct net_device *dev);static netdev_tx_t hamachi_start_xmit (struct sk_buff *skb,struct net_device *dev);
@@ -1042,7 +1042,7 @@ static void hamachi_timer(struct timer_list *t)add_timer (&hmp->timer); } -static void hamachi_tx_timeout (struct net_device *dev) +static void hamachi_tx_timeout (struct net_device *dev,int txqueue) {int i;struct hamachi_private *hmp =netdev_priv (dev);
drivers/net/ethernet/packetengines/yellowfin.c +2 -2
@@ -344,7 +344,7 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int valuestatic int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static int yellowfin_open (struct net_device *dev);static void yellowfin_timer (struct timer_list *t); -static void yellowfin_tx_timeout (struct net_device *dev); +static void yellowfin_tx_timeout (struct net_device *dev,int txqueue);static int yellowfin_init_ring (struct net_device *dev);static netdev_tx_t yellowfin_start_xmit (struct sk_buff *skb,struct net_device *dev);
@@ -677,7 +677,7 @@ static void yellowfin_timer(struct timer_list *t)add_timer (&yp->timer); } -static void yellowfin_tx_timeout (struct net_device *dev) +static void yellowfin_tx_timeout (struct net_device *dev,int txqueue) {struct yellowfin_private *yp =netdev_priv (dev);void __iomem *ioaddr = yp->base;
drivers/net/ethernet/pensando/ionic/ionic_lif.c +1 -1
@@ -1268,7 +1268,7 @@ static void ionic_tx_timeout_work(struct work_struct *ws)rtnl_unlock (); } -static void ionic_tx_timeout (struct net_device *netdev) +static void ionic_tx_timeout (struct net_device *netdev,int txqueue) {struct ionic_lif *lif =netdev_priv (netdev);
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +2 -2
@@ -49,7 +49,7 @@ static int netxen_nic_open(struct net_device *netdev);static int netxen_nic_close (struct net_device *netdev);static netdev_tx_t netxen_nic_xmit_frame (struct sk_buff *,struct net_device *); -static void netxen_tx_timeout (struct net_device *netdev); +static void netxen_tx_timeout (struct net_device *netdev,int txqueue);static void netxen_tx_timeout_task (struct work_struct *work);static void netxen_fw_poll_work (struct work_struct *work); static void netxen_schedule_work(struct netxen_adapter *adapter,
@@ -2222,7 +2222,7 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)netxen_advert_link_change (adapter, linkup); } -static void netxen_tx_timeout (struct net_device *netdev) +static void netxen_tx_timeout (struct net_device *netdev,int txqueue) {struct netxen_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/qlogic/qla3xxx.c +1 -1
@@ -3602,7 +3602,7 @@ static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)return 0 ; } -static void ql3xxx_tx_timeout (struct net_device *ndev) +static void ql3xxx_tx_timeout (struct net_device *ndev,int txqueue) {struct ql3_adapter *qdev =netdev_priv (ndev);
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +2 -2
@@ -56,7 +56,7 @@ static int qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent);static void qlcnic_remove (struct pci_dev *pdev);static int qlcnic_open (struct net_device *netdev);static int qlcnic_close (struct net_device *netdev); -static void qlcnic_tx_timeout (struct net_device *netdev); +static void qlcnic_tx_timeout (struct net_device *netdev,int txqueue);static void qlcnic_attach_work (struct work_struct *work);static void qlcnic_fwinit_work (struct work_struct *work);
@@ -3068,7 +3068,7 @@ static void qlcnic_dump_rings(struct qlcnic_adapter *adapter) } -static void qlcnic_tx_timeout (struct net_device *netdev) +static void qlcnic_tx_timeout (struct net_device *netdev,int txqueue) {struct qlcnic_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/qualcomm/emac/emac.c +1 -1
@@ -282,7 +282,7 @@ static int emac_close(struct net_device *netdev) }/* Respond to a TX hang */ -static void emac_tx_timeout (struct net_device *netdev) +static void emac_tx_timeout (struct net_device *netdev,int txqueue) {struct emac_adapter *adpt =netdev_priv (netdev);
drivers/net/ethernet/qualcomm/qca_spi.c +1 -1
@@ -786,7 +786,7 @@ qcaspi_netdev_xmit(struct sk_buff *skb, struct net_device *dev) }static void -qcaspi_netdev_tx_timeout (struct net_device *dev) +qcaspi_netdev_tx_timeout (struct net_device *dev,int txqueue) {struct qcaspi *qca =netdev_priv (dev);
drivers/net/ethernet/qualcomm/qca_uart.c +1 -1
@@ -248,7 +248,7 @@ qcauart_netdev_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void qcauart_netdev_tx_timeout (struct net_device *dev) +static void qcauart_netdev_tx_timeout (struct net_device *dev,int txqueue) {struct qcauart *qca =netdev_priv (dev);
drivers/net/ethernet/rdc/r6040.c +1 -1
@@ -410,7 +410,7 @@ static void r6040_init_mac_regs(struct net_device *dev)iowrite16 (TM2TX , ioaddr +MTPR ); } -static void r6040_tx_timeout (struct net_device *dev) +static void r6040_tx_timeout (struct net_device *dev,int txqueue) {struct r6040_private *priv =netdev_priv (dev);void __iomem *ioaddr = priv->base;
drivers/net/ethernet/realtek/8139cp.c +1 -1
@@ -1235,7 +1235,7 @@ static int cp_close (struct net_device *dev)return 0 ; } -static void cp_tx_timeout (struct net_device *dev) +static void cp_tx_timeout (struct net_device *dev,int txqueue) {struct cp_private *cp =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/realtek/atp.c +2 -2
@@ -204,7 +204,7 @@ static void net_rx(struct net_device *dev);static void read_block (long ioaddr,int length,unsigned char *buffer,int data_mode);static int net_close (struct net_device *dev);static void set_rx_mode (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);/* A list of all installed ATP devices, for removing the driver module. */
@@ -533,7 +533,7 @@ static void write_packet(long ioaddr, int length, unsigned char *packet, int padoutb (Ctrl_HNibWrite | Ctrl_SelData | Ctrl_IRQEN, ioaddr +PAR_CONTROL ); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {long ioaddr = dev->base_addr;
drivers/net/ethernet/realtek/r8169_main.c +1 -1
@@ -5662,7 +5662,7 @@ static void rtl_reset_work(struct rtl8169_private *tp)netif_wake_queue (dev); } -static void rtl8169_tx_timeout (struct net_device *dev) +static void rtl8169_tx_timeout (struct net_device *dev,int txqueue) {struct rtl8169_private *tp =netdev_priv (dev);
drivers/net/ethernet/renesas/ravb_main.c +1 -1
@@ -1425,7 +1425,7 @@ static int ravb_open(struct net_device *ndev) }/* Timeout function for Ethernet AVB */ -static void ravb_tx_timeout (struct net_device *ndev) +static void ravb_tx_timeout (struct net_device *ndev,int txqueue) {struct ravb_private *priv =netdev_priv (ndev);
drivers/net/ethernet/renesas/sh_eth.c +1 -1
@@ -2478,7 +2478,7 @@ static int sh_eth_open(struct net_device *ndev) }/* Timeout function */ -static void sh_eth_tx_timeout (struct net_device *ndev) +static void sh_eth_tx_timeout (struct net_device *ndev,int txqueue) {struct sh_eth_private *mdp =netdev_priv (ndev);struct sh_eth_rxdesc *rxdesc;
drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +1 -1
@@ -1572,7 +1572,7 @@ static int sxgbe_poll(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void sxgbe_tx_timeout (struct net_device *dev) +static void sxgbe_tx_timeout (struct net_device *dev,int txqueue) {struct sxgbe_priv_data *priv =netdev_priv (dev);
drivers/net/ethernet/seeq/ether3.c +2 -2
@@ -79,7 +79,7 @@ static netdev_tx_t ether3_sendpacket(struct sk_buff *skb,static irqreturn_t ether3_interrupt (int irq,void *dev_id);static int ether3_close (struct net_device *dev);static void ether3_setmulticastlist (struct net_device *dev); -static void ether3_timeout (struct net_device *dev); +static void ether3_timeout (struct net_device *dev,int txqueue);#define BUS_16 2#define BUS_8 1
@@ -450,7 +450,7 @@ static void ether3_setmulticastlist(struct net_device *dev)ether3_outw (priv (dev)->regs.config1 |CFG1_LOCBUFMEM ,REG_CONFIG1 ); } -static void ether3_timeout (struct net_device *dev) +static void ether3_timeout (struct net_device *dev,int txqueue) {unsigned long flags;
drivers/net/ethernet/seeq/sgiseeq.c +1 -1
@@ -645,7 +645,7 @@ sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void timeout (struct net_device *dev) +static void timeout (struct net_device *dev,int txqueue) {printk (KERN_NOTICE "%s: transmit timed out, resetting\n" , dev->name);sgiseeq_reset (dev);
drivers/net/ethernet/sgi/ioc3-eth.c +2 -2
@@ -113,7 +113,7 @@ struct ioc3_private {static int ioc3_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void ioc3_set_multicast_list (struct net_device *dev);static netdev_tx_t ioc3_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void ioc3_timeout (struct net_device *dev); +static void ioc3_timeout (struct net_device *dev,int txqueue);static inline unsigned int ioc3_hash (const unsigned char *addr);static void ioc3_start (struct ioc3_private *ip);static inline void ioc3_stop (struct ioc3_private *ip);
@@ -1493,7 +1493,7 @@ static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void ioc3_timeout (struct net_device *dev) +static void ioc3_timeout (struct net_device *dev,int txqueue) {struct ioc3_private *ip =netdev_priv (dev);
drivers/net/ethernet/sgi/meth.c +2 -2
@@ -90,7 +90,7 @@ struct meth_private {spinlock_t meth_lock; }; -static void meth_tx_timeout (struct net_device *dev); +static void meth_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t meth_interrupt (int irq,void *dev_id);/* global, initialized in ip32-setup.c */
@@ -727,7 +727,7 @@ static netdev_tx_t meth_tx(struct sk_buff *skb, struct net_device *dev)/* * Deal with a transmit timeout. */ -static void meth_tx_timeout (struct net_device *dev) +static void meth_tx_timeout (struct net_device *dev,int txqueue) {struct meth_private *priv =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/silan/sc92031.c +1 -1
@@ -1078,7 +1078,7 @@ static void sc92031_set_multicast_list(struct net_device *dev)spin_unlock_bh (&priv->lock); } -static void sc92031_tx_timeout (struct net_device *dev) +static void sc92031_tx_timeout (struct net_device *dev,int txqueue) {struct sc92031_priv *priv =netdev_priv (dev);
drivers/net/ethernet/sis/sis190.c +1 -1
@@ -1538,7 +1538,7 @@ static struct net_device *sis190_init_board(struct pci_dev *pdev) goto out; } -static void sis190_tx_timeout (struct net_device *dev) +static void sis190_tx_timeout (struct net_device *dev,int txqueue) {struct sis190_private *tp =netdev_priv (dev);void __iomem *ioaddr = tp->mmio_addr;
drivers/net/ethernet/smsc/epic100.c +2 -2
@@ -291,7 +291,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);static void mdio_write (struct net_device *dev,int phy_id,int loc,int val);static void epic_restart (struct net_device *dev);static void epic_timer (struct timer_list *t); -static void epic_tx_timeout (struct net_device *dev); +static void epic_tx_timeout (struct net_device *dev,int txqueue);static void epic_init_ring (struct net_device *dev);static netdev_tx_t epic_start_xmit (struct sk_buff *skb,struct net_device *dev);
@@ -861,7 +861,7 @@ static void epic_timer(struct timer_list *t)add_timer (&ep->timer); } -static void epic_tx_timeout (struct net_device *dev) +static void epic_tx_timeout (struct net_device *dev,int txqueue) {struct epic_private *ep =netdev_priv (dev);void __iomem *ioaddr = ep->ioaddr;
drivers/net/ethernet/smsc/smc911x.c +1 -1
@@ -1245,7 +1245,7 @@ static void smc911x_poll_controller(struct net_device *dev)#endif /* Our watchdog timed out. Called by the networking layer */ -static void smc911x_timeout (struct net_device *dev) +static void smc911x_timeout (struct net_device *dev,int txqueue) {struct smc911x_local *lp =netdev_priv (dev);int status, mask;
drivers/net/ethernet/smsc/smc9194.c +2 -2
@@ -216,7 +216,7 @@ static int smc_open(struct net_device *dev);/* . Our watchdog timed out. Called by the networking layer */ -static void smc_timeout (struct net_device *dev); +static void smc_timeout (struct net_device *dev,int txqueue);/* . This is called by the kernel in response to 'ifconfig ethX down'. It
@@ -1094,7 +1094,7 @@ static int smc_open(struct net_device *dev).-------------------------------------------------------- */ -static void smc_timeout (struct net_device *dev) +static void smc_timeout (struct net_device *dev,int txqueue) {/* If we get here, some higher level has decided we are broken. There should really be a "kick me" function call instead. */
drivers/net/ethernet/smsc/smc91c92_cs.c +2 -2
@@ -271,7 +271,7 @@ static void smc91c92_release(struct pcmcia_device *link);static int smc_open (struct net_device *dev);static int smc_close (struct net_device *dev);static int smc_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); -static void smc_tx_timeout (struct net_device *dev); +static void smc_tx_timeout (struct net_device *dev,int txqueue);static netdev_tx_t smc_start_xmit (struct sk_buff *skb,struct net_device *dev);static irqreturn_t smc_interrupt (int irq,void *dev_id);
@@ -1178,7 +1178,7 @@ static void smc_hardware_send_packet(struct net_device * dev)/*====================================================================*/ -static void smc_tx_timeout (struct net_device *dev) +static void smc_tx_timeout (struct net_device *dev,int txqueue) {struct smc_private *smc =netdev_priv (dev);unsigned int ioaddr = dev->base_addr;
drivers/net/ethernet/smsc/smc91x.c +1 -1
@@ -1321,7 +1321,7 @@ static void smc_poll_controller(struct net_device *dev)#endif /* Our watchdog timed out. Called by the networking layer */ -static void smc_timeout (struct net_device *dev) +static void smc_timeout (struct net_device *dev,int txqueue) {struct smc_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->base;
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1 -1
@@ -3712,7 +3712,7 @@ static int stmmac_napi_poll_tx(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void stmmac_tx_timeout (struct net_device *dev) +static void stmmac_tx_timeout (struct net_device *dev,int txqueue) {struct stmmac_priv *priv =netdev_priv (dev);
drivers/net/ethernet/sun/cassini.c +1 -1
@@ -2666,7 +2666,7 @@ static void cas_netpoll(struct net_device *dev) }#endif -static void cas_tx_timeout (struct net_device *dev) +static void cas_tx_timeout (struct net_device *dev,int txqueue) {struct cas *cp =netdev_priv (dev);
drivers/net/ethernet/sun/niu.c +1 -1
@@ -6517,7 +6517,7 @@ static void niu_reset_task(struct work_struct *work)spin_unlock_irqrestore (&np->lock, flags); } -static void niu_tx_timeout (struct net_device *dev) +static void niu_tx_timeout (struct net_device *dev,int txqueue) {struct niu *np =netdev_priv (dev);
drivers/net/ethernet/sun/sunbmac.c +1 -1
@@ -941,7 +941,7 @@ static int bigmac_close(struct net_device *dev)return 0 ; } -static void bigmac_tx_timeout (struct net_device *dev) +static void bigmac_tx_timeout (struct net_device *dev,int txqueue) {struct bigmac *bp =netdev_priv (dev);
drivers/net/ethernet/sun/sungem.c +1 -1
@@ -970,7 +970,7 @@ static void gem_poll_controller(struct net_device *dev) }#endif -static void gem_tx_timeout (struct net_device *dev) +static void gem_tx_timeout (struct net_device *dev,int txqueue) {struct gem *gp =netdev_priv (dev);
drivers/net/ethernet/sun/sunhme.c +1 -1
@@ -2246,7 +2246,7 @@ static int happy_meal_close(struct net_device *dev)#define SXD (x)#endif -static void happy_meal_tx_timeout (struct net_device *dev) +static void happy_meal_tx_timeout (struct net_device *dev,int txqueue) {struct happy_meal *hp =netdev_priv (dev);
drivers/net/ethernet/sun/sunqe.c +1 -1
@@ -544,7 +544,7 @@ static void qe_tx_reclaim(struct sunqe *qep) qep->tx_old = elem; } -static void qe_tx_timeout (struct net_device *dev) +static void qe_tx_timeout (struct net_device *dev,int txqueue) {struct sunqe *qep =netdev_priv (dev);int tx_full;
drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +1 -1
@@ -689,7 +689,7 @@ static int xlgmac_close(struct net_device *netdev)return 0 ; } -static void xlgmac_tx_timeout (struct net_device *netdev) +static void xlgmac_tx_timeout (struct net_device *netdev,int txqueue) {struct xlgmac_pdata *pdata =netdev_priv (netdev);
drivers/net/ethernet/ti/cpmac.c +1 -1
@@ -797,7 +797,7 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id)return IRQ_HANDLED ; } -static void cpmac_tx_timeout (struct net_device *dev) +static void cpmac_tx_timeout (struct net_device *dev,int txqueue) {struct cpmac_priv *priv =netdev_priv (dev);
drivers/net/ethernet/ti/cpsw.c +1 -1
@@ -2035,7 +2035,7 @@ static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd)return phy_mii_ioctl (cpsw->slaves[slave_no].phy, req, cmd); } -static void cpsw_ndo_tx_timeout (struct net_device *ndev) +static void cpsw_ndo_tx_timeout (struct net_device *ndev,int txqueue) {struct cpsw_priv *priv =netdev_priv (ndev);struct cpsw_common *cpsw = priv->cpsw;
drivers/net/ethernet/ti/davinci_emac.c +1 -1
@@ -983,7 +983,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)* error and re-initialize the TX channel for hardware operation * */ -static void emac_dev_tx_timeout (struct net_device *ndev) +static void emac_dev_tx_timeout (struct net_device *ndev,int txqueue) {struct emac_priv *priv =netdev_priv (ndev);struct device *emac_dev = &ndev->dev;
drivers/net/ethernet/ti/netcp_core.c +1 -1
@@ -1811,7 +1811,7 @@ static int netcp_ndo_ioctl(struct net_device *ndev,return (ret ==0 ) ?0 : err; } -static void netcp_ndo_tx_timeout (struct net_device *ndev) +static void netcp_ndo_tx_timeout (struct net_device *ndev,int txqueue) {struct netcp_intf *netcp =netdev_priv (ndev);unsigned int descs =knav_pool_count (netcp->tx_pool);
drivers/net/ethernet/ti/tlan.c +2 -2
@@ -161,7 +161,7 @@ static void tlan_set_multicast_list(struct net_device *);static int tlan_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static int tlan_probe1 (struct pci_dev *pdev,long ioaddr,int irq,int rev,const struct pci_device_id *ent); -static void tlan_tx_timeout (struct net_device *dev); +static void tlan_tx_timeout (struct net_device *dev,int txqueue);static void tlan_tx_timeout_work (struct work_struct *work);static int tlan_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);
@@ -997,7 +997,7 @@ static int tlan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)* **************************************************************/ -static void tlan_tx_timeout (struct net_device *dev) +static void tlan_tx_timeout (struct net_device *dev,int txqueue) {TLAN_DBG (TLAN_DEBUG_GNRL ,"%s: Transmit timed out.\n" , dev->name);
drivers/net/ethernet/toshiba/ps3_gelic_net.c +1 -1
@@ -1405,7 +1405,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work)* * called, if tx hangs. Schedules a task that resets the interface */ -void gelic_net_tx_timeout (struct net_device *netdev) +void gelic_net_tx_timeout (struct net_device *netdev,int txqueue) {struct gelic_card *card;
drivers/net/ethernet/toshiba/spider_net.c +1 -1
@@ -2180,7 +2180,7 @@ spider_net_tx_timeout_task(struct work_struct *work)* called, if tx hangs. Schedules a task that resets the interface */ static void -spider_net_tx_timeout (struct net_device *netdev) +spider_net_tx_timeout (struct net_device *netdev,int txqueue) {struct spider_net_card *card;
drivers/net/ethernet/toshiba/tc35815.c +2 -2
@@ -483,7 +483,7 @@ static void tc35815_txdone(struct net_device *dev);static int tc35815_close (struct net_device *dev);static struct net_device_stats *tc35815_get_stats (struct net_device *dev);static void tc35815_set_multicast_list (struct net_device *dev); -static void tc35815_tx_timeout (struct net_device *dev); +static void tc35815_tx_timeout (struct net_device *dev,int txqueue);static int tc35815_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);#ifdef CONFIG_NET_POLL_CONTROLLER static void tc35815_poll_controller (struct net_device *dev);
@@ -1189,7 +1189,7 @@ static void tc35815_schedule_restart(struct net_device *dev)spin_unlock_irqrestore (&lp->lock, flags); } -static void tc35815_tx_timeout (struct net_device *dev) +static void tc35815_tx_timeout (struct net_device *dev,int txqueue) {struct tc35815_regs __iomem *tr = (struct tc35815_regs __iomem *)dev->base_addr;
drivers/net/ethernet/via/via-rhine.c +2 -2
@@ -506,7 +506,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int valstatic int rhine_open (struct net_device *dev);static void rhine_reset_task (struct work_struct *work);static void rhine_slow_event_task (struct work_struct *work); -static void rhine_tx_timeout (struct net_device *dev); +static void rhine_tx_timeout (struct net_device *dev,int txqueue);static netdev_tx_t rhine_start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t rhine_interrupt (int irq,void *dev_instance);
@@ -1761,7 +1761,7 @@ static void rhine_reset_task(struct work_struct *work)mutex_unlock (&rp->task_lock); } -static void rhine_tx_timeout (struct net_device *dev) +static void rhine_tx_timeout (struct net_device *dev,int txqueue) {struct rhine_private *rp =netdev_priv (dev);void __iomem *ioaddr = rp->base;
drivers/net/ethernet/wiznet/w5100.c +1 -1
@@ -790,7 +790,7 @@ static void w5100_restart_work(struct work_struct *work)w5100_restart (priv->ndev); } -static void w5100_tx_timeout (struct net_device *ndev) +static void w5100_tx_timeout (struct net_device *ndev,int txqueue) {struct w5100_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/wiznet/w5300.c +1 -1
@@ -341,7 +341,7 @@ static void w5300_get_regs(struct net_device *ndev, } } -static void w5300_tx_timeout (struct net_device *ndev) +static void w5300_tx_timeout (struct net_device *ndev,int txqueue) {struct w5300_priv *priv =netdev_priv (ndev);
drivers/net/ethernet/xilinx/xilinx_emaclite.c +1 -1
@@ -521,7 +521,7 @@ static int xemaclite_set_mac_address(struct net_device *dev, void *address)* * This function is called when Tx time out occurs for Emaclite device. */ -static void xemaclite_tx_timeout (struct net_device *dev) +static void xemaclite_tx_timeout (struct net_device *dev,int txqueue) {struct net_local *lp =netdev_priv (dev);unsigned long flags;
drivers/net/ethernet/xircom/xirc2ps_cs.c +2 -2
@@ -288,7 +288,7 @@ struct local_info {*/ static netdev_tx_t do_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void xirc_tx_timeout (struct net_device *dev); +static void xirc_tx_timeout (struct net_device *dev,int txqueue);static void xirc2ps_tx_timeout_task (struct work_struct *work);static void set_addresses (struct net_device *dev);static void set_multicast_list (struct net_device *dev);
@@ -1203,7 +1203,7 @@ xirc2ps_tx_timeout_task(struct work_struct *work) }static void -xirc_tx_timeout (struct net_device *dev) +xirc_tx_timeout (struct net_device *dev,int txqueue) {struct local_info *lp =netdev_priv (dev); dev->stats.tx_errors++;
drivers/net/fjes/fjes_main.c +1 -1
@@ -792,7 +792,7 @@ fjes_xmit_frame(struct sk_buff *skb, struct net_device *netdev)return ret; } -static void fjes_tx_retry (struct net_device *netdev) +static void fjes_tx_retry (struct net_device *netdev,int txqueue) {struct netdev_queue *queue =netdev_get_tx_queue (netdev,0 );
drivers/net/slip/slip.c +1 -1
@@ -457,7 +457,7 @@ static void slip_write_wakeup(struct tty_struct *tty)schedule_work (&sl->tx_work); } -static void sl_tx_timeout (struct net_device *dev) +static void sl_tx_timeout (struct net_device *dev,int txqueue) {struct slip *sl =netdev_priv (dev);
drivers/net/usb/catc.c +1 -1
@@ -447,7 +447,7 @@ static netdev_tx_t catc_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void catc_tx_timeout (struct net_device *netdev) +static void catc_tx_timeout (struct net_device *netdev,int txqueue) {struct catc *catc =netdev_priv (netdev);
drivers/net/usb/hso.c +1 -1
@@ -820,7 +820,7 @@ static const struct ethtool_ops ops = { };/* called when a packet did not ack after watchdogtimeout */ -static void hso_net_tx_timeout (struct net_device *net) +static void hso_net_tx_timeout (struct net_device *net,int txqueue) {struct hso_net *odev =netdev_priv (net);
drivers/net/usb/ipheth.c +1 -1
@@ -400,7 +400,7 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)return NETDEV_TX_OK ; } -static void ipheth_tx_timeout (struct net_device *net) +static void ipheth_tx_timeout (struct net_device *net,int txqueue) {struct ipheth_device *dev =netdev_priv (net);
drivers/net/usb/kaweth.c +1 -1
@@ -894,7 +894,7 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)/**************************************************************** * kaweth_tx_timeout ****************************************************************/ -static void kaweth_tx_timeout (struct net_device *net) +static void kaweth_tx_timeout (struct net_device *net,int txqueue) {struct kaweth_device *kaweth =netdev_priv (net);
drivers/net/usb/lan78xx.c +1 -1
@@ -3662,7 +3662,7 @@ static void lan78xx_disconnect(struct usb_interface *intf)usb_put_dev (udev); } -static void lan78xx_tx_timeout (struct net_device *net) +static void lan78xx_tx_timeout (struct net_device *net,int txqueue) {struct lan78xx_net *dev =netdev_priv (net);
drivers/net/usb/pegasus.c +1 -1
@@ -693,7 +693,7 @@ static void intr_callback(struct urb *urb) "can't resubmit interrupt urb, %d\n", res); } -static void pegasus_tx_timeout (struct net_device *net) +static void pegasus_tx_timeout (struct net_device *net,int txqueue) {pegasus_t *pegasus =netdev_priv (net);netif_warn (pegasus, timer, net,"tx timeout\n" );
drivers/net/usb/r8152.c +1 -1
@@ -2306,7 +2306,7 @@ static void rtl_drop_queued_tx(struct r8152 *tp) } } -static void rtl8152_tx_timeout (struct net_device *netdev) +static void rtl8152_tx_timeout (struct net_device *netdev,int txqueue) {struct r8152 *tp =netdev_priv (netdev);
drivers/net/usb/rtl8150.c +1 -1
@@ -655,7 +655,7 @@ static void disable_net_traffic(rtl8150_t * dev)set_registers (dev,CR ,1 , &cr); } -static void rtl8150_tx_timeout (struct net_device *netdev) +static void rtl8150_tx_timeout (struct net_device *netdev,int txqueue) {rtl8150_t *dev =netdev_priv (netdev);dev_warn (&netdev->dev,"Tx timeout.\n" );
drivers/net/vmxnet3/vmxnet3_drv.c +1 -1
@@ -3198,7 +3198,7 @@ vmxnet3_free_intr_resources(struct vmxnet3_adapter *adapter)static void -vmxnet3_tx_timeout (struct net_device *netdev) +vmxnet3_tx_timeout (struct net_device *netdev,int txqueue) {struct vmxnet3_adapter *adapter =netdev_priv (netdev); adapter->tx_timeout_count++;
drivers/net/wan/cosa.c +2 -2
@@ -268,7 +268,7 @@ static int cosa_net_attach(struct net_device *dev, unsigned short encoding, unsigned short parity);static int cosa_net_open (struct net_device *d);static int cosa_net_close (struct net_device *d); -static void cosa_net_timeout (struct net_device *d); +static void cosa_net_timeout (struct net_device *d,int txqueue);static netdev_tx_t cosa_net_tx (struct sk_buff *skb,struct net_device *d);static char *cosa_net_setup_rx (struct channel_data *channel,int size);static int cosa_net_rx_done (struct channel_data *channel);
@@ -670,7 +670,7 @@ static netdev_tx_t cosa_net_tx(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void cosa_net_timeout (struct net_device *dev) +static void cosa_net_timeout (struct net_device *dev,int txqueue) {struct channel_data *chan =dev_to_chan (dev);
drivers/net/wan/farsync.c +1 -1
@@ -2239,7 +2239,7 @@ fst_attach(struct net_device *dev, unsigned short encoding, unsigned short parit }static void -fst_tx_timeout (struct net_device *dev) +fst_tx_timeout (struct net_device *dev,int txqueue) {struct fst_port_info *port;struct fst_card_info *card;
drivers/net/wan/fsl_ucc_hdlc.c +1 -1
@@ -1039,7 +1039,7 @@ static const struct dev_pm_ops uhdlc_pm_ops = {#define HDLC_PM_OPS NULL#endif -static void uhdlc_tx_timeout (struct net_device *ndev) +static void uhdlc_tx_timeout (struct net_device *ndev,int txqueue) {netdev_err (ndev,"%s\n" , __func__); }
drivers/net/wan/lmc/lmc_main.c +2 -2
@@ -99,7 +99,7 @@ static int lmc_ifdown(struct net_device * const);static void lmc_watchdog (struct timer_list *t);static void lmc_reset (lmc_softc_t *const sc);static void lmc_dec_reset (lmc_softc_t *const sc); -static void lmc_driver_timeout (struct net_device *dev); +static void lmc_driver_timeout (struct net_device *dev,int txqueue);/* * linux reserves 16 device specific IOCTLs. We call them
@@ -2044,7 +2044,7 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, /*fold00lmc_trace (sc->lmc_device,"lmc_initcsrs out" ); } -static void lmc_driver_timeout (struct net_device *dev) +static void lmc_driver_timeout (struct net_device *dev,int txqueue) {lmc_softc_t *sc =dev_to_sc (dev);u32 csr6;
drivers/net/wan/x25_asy.c +1 -1
@@ -276,7 +276,7 @@ static void x25_asy_write_wakeup(struct tty_struct *tty) sl->xhead += actual; } -static void x25_asy_timeout (struct net_device *dev) +static void x25_asy_timeout (struct net_device *dev,int txqueue) {struct x25_asy *sl =netdev_priv (dev);
drivers/net/wireless/intel/ipw2x00/ipw2100.c +1 -1
@@ -5834,7 +5834,7 @@ static int ipw2100_close(struct net_device *dev)/* * TODO: Fix this function... its just wrong */ -static void ipw2100_tx_timeout (struct net_device *dev) +static void ipw2100_tx_timeout (struct net_device *dev,int txqueue) {struct ipw2100_priv *priv =libipw_priv (dev);
drivers/net/wireless/intersil/hostap/hostap_main.c +1 -1
@@ -761,7 +761,7 @@ static void hostap_set_multicast_list(struct net_device *dev) } -static void prism2_tx_timeout (struct net_device *dev) +static void prism2_tx_timeout (struct net_device *dev,int txqueue) {struct hostap_interface *iface;local_info_t *local;
drivers/net/wireless/intersil/orinoco/main.c +1 -1
@@ -647,7 +647,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, struct hermes *hw)netif_wake_queue (dev); } -void orinoco_tx_timeout (struct net_device *dev) +void orinoco_tx_timeout (struct net_device *dev,int txqueue) {struct orinoco_private *priv =ndev_priv (dev);struct net_device_stats *stats = &dev->stats;
drivers/net/wireless/marvell/mwifiex/main.c +1 -1
@@ -1019,7 +1019,7 @@ static void mwifiex_set_multicast_list(struct net_device *dev)* CFG802.11 network device handler for transmission timeout. */ static void -mwifiex_tx_timeout (struct net_device *dev) +mwifiex_tx_timeout (struct net_device *dev,int txqueue) {struct mwifiex_private *priv =mwifiex_netdev_get_priv (dev);
drivers/net/wireless/quantenna/qtnfmac/core.c +1 -1
@@ -148,7 +148,7 @@ static void qtnf_netdev_get_stats64(struct net_device *ndev,/* Netdev handler for transmission timeout. */ -static void qtnf_netdev_tx_timeout (struct net_device *ndev) +static void qtnf_netdev_tx_timeout (struct net_device *ndev,int txqueue) {struct qtnf_vif *vif =qtnf_netdev_get_priv (ndev);struct qtnf_wmac *mac;
drivers/net/wireless/wl3501_cs.c +1 -1
@@ -1285,7 +1285,7 @@ static int wl3501_reset(struct net_device *dev)return rc; } -static void wl3501_tx_timeout (struct net_device *dev) +static void wl3501_tx_timeout (struct net_device *dev,int txqueue) {struct net_device_stats *stats = &dev->stats;int rc;
drivers/net/wireless/zydas/zd1201.c +1 -1
@@ -830,7 +830,7 @@ static netdev_tx_t zd1201_hard_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void zd1201_tx_timeout (struct net_device *dev) +static void zd1201_tx_timeout (struct net_device *dev,int txqueue) {struct zd1201 *zd =netdev_priv (dev);
drivers/staging/ks7010/ks_wlan_net.c +2 -2
@@ -45,7 +45,7 @@ struct wep_key {* function prototypes */ static int ks_wlan_open (struct net_device *dev); -static void ks_wlan_tx_timeout (struct net_device *dev); +static void ks_wlan_tx_timeout (struct net_device *dev,int txqueue);static int ks_wlan_start_xmit (struct sk_buff *skb,struct net_device *dev);static int ks_wlan_close (struct net_device *dev);static void ks_wlan_set_rx_mode (struct net_device *dev);
@@ -2498,7 +2498,7 @@ int ks_wlan_set_mac_address(struct net_device *dev, void *addr) }static -void ks_wlan_tx_timeout (struct net_device *dev) +void ks_wlan_tx_timeout (struct net_device *dev,int txqueue) {struct ks_wlan_private *priv =netdev_priv (dev);
drivers/staging/qlge/qlge_main.c +1 -1
@@ -4436,7 +4436,7 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)return status; } -static void qlge_tx_timeout (struct net_device *ndev) +static void qlge_tx_timeout (struct net_device *ndev,int txqueue) {struct ql_adapter *qdev =netdev_priv (ndev);ql_queue_asic_error (qdev);
drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1 -1
@@ -267,7 +267,7 @@ static short _rtl92e_check_nic_enough_desc(struct net_device *dev, int prio)return 0 ; } -static void _rtl92e_tx_timeout (struct net_device *dev) +static void _rtl92e_tx_timeout (struct net_device *dev,int txqueue) {struct r8192_priv *priv =rtllib_priv (dev);
drivers/staging/rtl8192u/r8192U_core.c +1 -1
@@ -654,7 +654,7 @@ short check_nic_enough_desc(struct net_device *dev, int queue_index)return (used <MAX_TX_URB ); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct r8192_priv *priv =ieee80211_priv (dev);
drivers/staging/unisys/visornic/visornic_main.c +1 -1
@@ -1078,7 +1078,7 @@ static void visornic_set_multi(struct net_device *netdev)* Queue the work and return. Make sure we have not already been informed that * the IO Partition is gone; if so, we will have already timed-out the xmits. */ -static void visornic_xmit_timeout (struct net_device *netdev) +static void visornic_xmit_timeout (struct net_device *netdev,int txqueue) {struct visornic_devdata *devdata =netdev_priv (netdev);unsigned long flags;
drivers/staging/wlan-ng/p80211netdev.c +2 -2
@@ -101,7 +101,7 @@ static void p80211knetdev_set_multicast_list(struct net_device *dev);static int p80211knetdev_do_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd);static int p80211knetdev_set_mac_address (struct net_device *dev,void *addr); -static void p80211knetdev_tx_timeout (struct net_device *netdev); +static void p80211knetdev_tx_timeout (struct net_device *netdev,int txqueue);static int p80211_rx_typedrop (struct wlandevice *wlandev,u16 fc);int wlan_watchdog =5000 ;
@@ -1074,7 +1074,7 @@ static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc)return drop; } -static void p80211knetdev_tx_timeout (struct net_device *netdev) +static void p80211knetdev_tx_timeout (struct net_device *netdev,int txqueue) {struct wlandevice *wlandev = netdev->ml_priv;
drivers/tty/n_gsm.c +1 -1
@@ -2704,7 +2704,7 @@ static netdev_tx_t gsm_mux_net_start_xmit(struct sk_buff *skb, }/* called when a packet did not ack after watchdogtimeout */ -static void gsm_mux_net_tx_timeout (struct net_device *net) +static void gsm_mux_net_tx_timeout (struct net_device *net,int txqueue) {/* Tell syslog we are hosed. */ dev_dbg (&net->dev,"Tx timed out.\n" );
drivers/tty/synclink.c +1 -1
@@ -7837,7 +7837,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {struct mgsl_struct *info =dev_to_port (dev);unsigned long flags;
drivers/tty/synclink_gt.c +1 -1
@@ -1682,7 +1682,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {struct slgt_info *info =dev_to_port (dev);unsigned long flags;
drivers/tty/synclinkmp.c +1 -1
@@ -1807,7 +1807,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {SLMP_INFO *info =dev_to_port (dev);unsigned long flags;
include/linux/netdevice.h +3 -2
@@ -1004,7 +1004,7 @@ struct tlsdev_ops;* Called when a user wants to change the Maximum Transfer Unit * of a device. * -* void (*ndo_tx_timeout)(struct net_device *dev); +* void (*ndo_tx_timeout)(struct net_device *dev, int txqueue); * Callback used when the transmitter has not made any progress * for dev->watchdog ticks. *
@@ -1271,7 +1271,8 @@ struct net_device_ops { int new_mtu);int (*ndo_neigh_setup)(struct net_device *dev,struct neigh_parms *); -void (*ndo_tx_timeout) (struct net_device *dev); +void (*ndo_tx_timeout) (struct net_device *dev, +int txqueue);void (*ndo_get_stats64)(struct net_device *dev,struct rtnl_link_stats64 *storage);
net/atm/lec.c +1 -1
@@ -194,7 +194,7 @@ lec_send(struct atm_vcc *vcc, struct sk_buff *skb) dev->stats.tx_bytes += skb->len; } -static void lec_tx_timeout (struct net_device *dev) +static void lec_tx_timeout (struct net_device *dev,int txqueue) {pr_info ("%s\n" , dev->name);netif_trans_update (dev);
net/bluetooth/bnep/netdev.c +1 -1
@@ -112,7 +112,7 @@ static int bnep_net_set_mac_addr(struct net_device *dev, void *arg)return 0 ; } -static void bnep_net_timeout (struct net_device *dev) +static void bnep_net_timeout (struct net_device *dev,int txqueue) {BT_DBG ("net_timeout" );netif_wake_queue (dev);
net/sched/sch_generic.c +1 -1
@@ -446,7 +446,7 @@ static void dev_watchdog(struct timer_list *t)trace_net_dev_xmit_timeout (dev, i);WARN_ONCE (1 ,KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n" , dev->name,netdev_drivername (dev), i); - dev->netdev_ops->ndo_tx_timeout (dev); + dev->netdev_ops->ndo_tx_timeout (dev, i); } if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies +
Em sex., 22 de nov. de 2019 às 11:53, Michael S. Tsirkin <[email protected]> escreveu:
Quoted 572 lines · Julio Faracco
Quoted 118 lines
Hi Michael,
Em sex., 22 de nov. de 2019 às 07:31, Michael S. Tsirkin <[email protected]> escreveu:
Quoted 99 lines · Julio Faracco
Quoted 84 lines
Driver
virtio_netis not handling error events for TX provided bydev_watchdog. This event is reached when transmission queue is having problems to transmit packets. This could happen for any reason. To enable it, driver should have .ndo_tx_timeout implemented.This commit brings back
virtnet_resetmethod to recover TX queues from a error state. That function is called byschedule_workmethod and it puts the reset function into work queue.As the error cause is unknown at this moment, it would be better to reset all queues.
Signed-off-by Julio Faracco <[email protected]>Signed-off-by Daiane Mendes <[email protected]>Cc Jason Wang <[email protected]>---
v1-v2: Tagnet-nextwas included to indentify where patch would be applied.--- drivers/net/virtio_net.c | 95 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)drivers/net/virtio_net.c +11
-1@@ -75,6 +75,7 @@ struct virtnet_sq_stats {u64 xdp_tx;u64 xdp_tx_drops;u64 kicks; +u64 tx_timeouts; };struct virtnet_rq_stats {@@ -98,6 +99,7 @@ static const struct virtnet_stat_desc virtnet_sq_stats_desc[] = { { "xdp_tx", VIRTNET_SQ_STAT(xdp_tx) }, { "xdp_tx_drops", VIRTNET_SQ_STAT(xdp_tx_drops) }, { "kicks", VIRTNET_SQ_STAT(kicks) }, + { "tx_timeouts", VIRTNET_SQ_STAT(tx_timeouts) }, }; static const struct virtnet_stat_desc virtnet_rq_stats_desc[] = {@@ -211,6 +213,9 @@ struct virtnet_info {/* Work struct for config space updates */ struct work_struct config_work; +/* Work struct for resetting the virtio-net driver. */ +struct work_struct reset_work; +/* Does the affinity hint is set for virtqueues? */ bool affinity_hint_set;@@ -1721,7 +1726,7 @@ static void virtnet_stats(struct net_device *dev,int i;for (i =0 ; i < vi->max_queue_pairs; i++) { -u64 tpackets, tbytes, rpackets, rbytes, rdrops; +u64 tpackets, tbytes, terrors, rpackets, rbytes, rdrops;struct receive_queue *rq = &vi->rq[i];struct send_queue *sq = &vi->sq[i];@@ -1729,6 +1734,7 @@ static void virtnet_stats(struct net_device *dev, start =u64_stats_fetch_begin_irq (&sq->stats.syncp); tpackets = sq->stats.packets; tbytes = sq->stats.bytes; + terrors = sq->stats.tx_timeouts; }while (u64_stats_fetch_retry_irq (&sq->stats.syncp, start)); do {@@ -1743,6 +1749,7 @@ static void virtnet_stats(struct net_device *dev, tot->rx_bytes += rbytes; tot->tx_bytes += tbytes; tot->rx_dropped += rdrops; + tot->tx_errors += terrors; } tot->tx_dropped = dev->stats.tx_dropped;@@ -2578,6 +2585,33 @@ static int virtnet_set_features(struct net_device *dev,return 0 ; } +static void virtnet_tx_timeout (struct net_device *dev) +{ +struct virtnet_info *vi =netdev_priv (dev);drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2600
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+u32 i; + +netdev_warn (dev,"TX timeout stats:\n" ); +/* find the stopped queue the same way dev_watchdog() does */ +for (i =0 ; i < vi->curr_queue_pairs; i++) { +struct send_queue *sq = &vi->sq[i]; + +if (!netif_xmit_stopped (netdev_get_tx_queue (dev, i))) { +netdev_warn (dev," Available send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name);What does this mean?
Quoted 14 lines
drivers/net/virtio_net.c static int virtnet_set_features(struct net_device *dev, · line 2610
Quoted 10 lines
drivers/net/virtio_net.c +10
-0+continue ; + } + +u64_stats_update_begin (&sq->stats.syncp); + sq->stats.tx_timeouts++; +u64_stats_update_end (&sq->stats.syncp); + +netdev_warn (dev," Unavailable send queue: %d, sq: %s, vq: %d, name: %s\n" , + i, sq->name, sq->vq->index, sq->vq->name); + }Can we make the warning less cryptic?
I wonder why don't we get the sq from timeout directly? Would seem cleaner.Quoted 2 lines
I need your help with debbuging information. What kind of field shoud it notify when a TX timeout occurs?
I am just saying this: why don't we add a "txqueue" parameter to
ndo_tx_timeout? It's not hard - just need to be careful to fix all callers. I got the list of files and functions by grepping forndo_tx_timeout. The massaged it with the following script.#/usr/bin/perl
use strict;
use warnings;our $^I = '.bak';
my @work = (
["arch/m68k/emu/nfeth.c", "nfeth_tx_timeout"],
["arch/um/drivers/net_kern.c", "uml_net_tx_timeout"],
["arch/um/drivers/vector_kern.c", "vector_net_tx_timeout"],
["arch/xtensa/platforms/iss/network.c", "iss_net_tx_timeout"], ["drivers/char/pcmcia/synclink_cs.c", "hdlcdev_tx_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"], ["drivers/infiniband/ulp/ipoib/ipoib_main.c", "ipoib_timeout"],
["drivers/message/fusion/mptlan.c", "mpt_lan_tx_timeout"],
["drivers/misc/sgi-xp/xpnet.c", "xpnet_dev_tx_timeout"],
["drivers/net/appletalk/cops.c", "cops_timeout"],
["drivers/net/arcnet/arcnet.c", "arcnet_timeout"],
["drivers/net/arcnet/com20020.c", "arcnet_timeout"],
["drivers/net/ethernet/3com/3c509.c", "el3_tx_timeout"],
["drivers/net/ethernet/3com/3c515.c", "corkscrew_timeout"], ["drivers/net/ethernet/3com/3c574_cs.c", "el3_tx_timeout"], ["drivers/net/ethernet/3com/3c589_cs.c", "el3_tx_timeout"],
["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"],
["drivers/net/ethernet/3com/3c59x.c", "vortex_tx_timeout"],
["drivers/net/ethernet/3com/typhoon.c", "typhoon_tx_timeout"],
["drivers/net/ethernet/8390/8390.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/8390p.c", "eip_tx_timeout"],
["drivers/net/ethernet/8390/ax88796.c", "ax_ei_tx_timeout"], ["drivers/net/ethernet/8390/axnet_cs.c", "axnet_tx_timeout"], ["drivers/net/ethernet/8390/etherh.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/hydra.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/mac8390.c", "__ei_tx_timeout"],
["drivers/net/ethernet/8390/mcf8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/8390/ne2k-pci.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/pcnet_cs.c", "ei_tx_timeout"], ["drivers/net/ethernet/8390/smc-ultra.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/wd.c", "ei_tx_timeout"],
["drivers/net/ethernet/8390/zorro8390.c", "__ei_tx_timeout"], ["drivers/net/ethernet/adaptec/starfire.c", "tx_timeout"],
["drivers/net/ethernet/agere/et131x.c", "et131x_tx_timeout"], ["drivers/net/ethernet/allwinner/sun4i-emac.c", "emac_timeout"], ["drivers/net/ethernet/alteon/acenic.c", "ace_watchdog"], ["drivers/net/ethernet/amazon/ena/ena_netdev.c", "ena_tx_timeout"], ["drivers/net/ethernet/amd/a2065.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/am79c961a.c", "am79c961_timeout"], ["drivers/net/ethernet/amd/amd8111e.c", "amd8111e_tx_timeout"], ["drivers/net/ethernet/amd/ariadne.c", "ariadne_tx_timeout"], ["drivers/net/ethernet/amd/atarilance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/au1000_eth.c", "au1000_tx_timeout"], ["drivers/net/ethernet/amd/declance.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/lance.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/mvme147.c", "lance_tx_timeout"],
["drivers/net/ethernet/amd/ni65.c", "ni65_timeout"],
["drivers/net/ethernet/amd/nmclan_cs.c", "mace_tx_timeout"],
["drivers/net/ethernet/amd/pcnet32.c", "pcnet32_tx_timeout"], ["drivers/net/ethernet/amd/sunlance.c", "lance_tx_timeout"], ["drivers/net/ethernet/amd/xgbe/xgbe-drv.c", "xgbe_tx_timeout"], ["drivers/net/ethernet/apm/xgene-v2/main.c", "xge_timeout"], ["drivers/net/ethernet/apm/xgene/xgene_enet_main.c", "xgene_enet_timeout"], ["drivers/net/ethernet/apple/macmace.c", "mace_tx_timeout"], ["drivers/net/ethernet/atheros/ag71xx.c", "ag71xx_tx_timeout"], ["drivers/net/ethernet/atheros/alx/main.c", "alx_tx_timeout"], ["drivers/net/ethernet/atheros/atl1c/atl1c_main.c", "atl1c_tx_timeout"], ["drivers/net/ethernet/atheros/atl1e/atl1e_main.c", "atl1e_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl1.c", "atlx_tx_timeout"], ["drivers/net/ethernet/atheros/atlx/atl2.c", "atl2_tx_timeout"], ["drivers/net/ethernet/broadcom/b44.c", "b44_tx_timeout"], ["drivers/net/ethernet/broadcom/bcmsysport.c", "bcm_sysport_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2.c", "bnx2_tx_timeout"], ["drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c", "bnx2x_tx_timeout"], ["drivers/net/ethernet/broadcom/bnxt/bnxt.c", "bnxt_tx_timeout"], ["drivers/net/ethernet/broadcom/genet/bcmgenet.c", "bcmgenet_timeout"], ["drivers/net/ethernet/broadcom/sb1250-mac.c", "sbmac_tx_timeout"], ["drivers/net/ethernet/broadcom/tg3.c", "tg3_tx_timeout"],
["drivers/net/ethernet/calxeda/xgmac.c", "xgmac_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_main.c", "liquidio_tx_timeout"], ["drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c", "lio_vf_rep_tx_timeout"], ["drivers/net/ethernet/cavium/thunder/nicvf_main.c", "nicvf_tx_timeout"], ["drivers/net/ethernet/cirrus/cs89x0.c", "net_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cisco/enic/enic_main.c", "enic_tx_timeout"], ["drivers/net/ethernet/cortina/gemini.c", "gmac_tx_timeout"], ["drivers/net/ethernet/davicom/dm9000.c", "dm9000_timeout"], ["drivers/net/ethernet/dec/tulip/de2104x.c", "de_tx_timeout"], ["drivers/net/ethernet/dec/tulip/tulip_core.c", "tulip_tx_timeout"], ["drivers/net/ethernet/dec/tulip/winbond-840.c", "tx_timeout"], ["drivers/net/ethernet/dlink/dl2k.c", "rio_tx_timeout"],
["drivers/net/ethernet/dlink/sundance.c", "tx_timeout"], ["drivers/net/ethernet/emulex/benet/be_main.c", "be_tx_timeout"],
["drivers/net/ethernet/ethoc.c", "ethoc_tx_timeout"],
["drivers/net/ethernet/faraday/ftgmac100.c", "ftgmac100_tx_timeout"], ["drivers/net/ethernet/fealnx.c", "fealnx_tx_timeout"], ["drivers/net/ethernet/freescale/dpaa/dpaa_eth.c", "dpaa_tx_timeout"], ["drivers/net/ethernet/freescale/fec_main.c", "fec_timeout"], ["drivers/net/ethernet/freescale/fec_mpc52xx.c", "mpc52xx_fec_tx_timeout"], ["drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c", "fs_timeout"], ["drivers/net/ethernet/freescale/gianfar.c", "gfar_timeout"], ["drivers/net/ethernet/freescale/ucc_geth.c", "ucc_geth_timeout"], ["drivers/net/ethernet/fujitsu/fmvj18x_cs.c", "fjn_tx_timeout"], ["drivers/net/ethernet/google/gve/gve_main.c", "gve_tx_timeout"], ["drivers/net/ethernet/hisilicon/hip04_eth.c", "hip04_timeout"], ["drivers/net/ethernet/hisilicon/hix5hd2_gmac.c", "hix5hd2_net_timeout"], ["drivers/net/ethernet/hisilicon/hns/hns_enet.c", "hns_nic_net_timeout"], ["drivers/net/ethernet/hisilicon/hns3/hns3_enet.c", "hns3_nic_net_timeout"], ["drivers/net/ethernet/huawei/hinic/hinic_main.c", "hinic_tx_timeout"], ["drivers/net/ethernet/i825xx/82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/ether1.c", "ether1_timeout"], ["drivers/net/ethernet/i825xx/lib82596.c", "i596_tx_timeout"], ["drivers/net/ethernet/i825xx/sun3_82586.c", "sun3_82586_timeout"], ["drivers/net/ethernet/ibm/ehea/ehea_main.c", "ehea_tx_watchdog"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"], ["drivers/net/ethernet/ibm/emac/core.c", "emac_tx_timeout"],
["drivers/net/ethernet/ibm/ibmvnic.c", "ibmvnic_tx_timeout"],
["drivers/net/ethernet/intel/e100.c", "e100_tx_timeout"], ["drivers/net/ethernet/intel/e1000/e1000_main.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/e1000e/netdev.c", "e1000_tx_timeout"], ["drivers/net/ethernet/intel/fm10k/fm10k_netdev.c", "fm10k_tx_timeout"], ["drivers/net/ethernet/intel/i40e/i40e_main.c", "i40e_tx_timeout"], ["drivers/net/ethernet/intel/iavf/iavf_main.c", "iavf_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/ice/ice_main.c", "ice_tx_timeout"], ["drivers/net/ethernet/intel/igb/igb_main.c", "igb_tx_timeout"], ["drivers/net/ethernet/intel/igbvf/netdev.c", "igbvf_tx_timeout"], ["drivers/net/ethernet/intel/ixgb/ixgb_main.c", "ixgb_tx_timeout"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c", "adapter->netdev->netdev_ops->ndo_tx_timeout(adapter->netdev);"], ["drivers/net/ethernet/intel/ixgbe/ixgbe_main.c", "ixgbe_tx_timeout"], ["drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c", "ixgbevf_tx_timeout"], ["drivers/net/ethernet/jme.c", "jme_tx_timeout"],
["drivers/net/ethernet/korina.c", "korina_tx_timeout"],
["drivers/net/ethernet/lantiq_etop.c", "ltq_etop_tx_timeout"], ["drivers/net/ethernet/marvell/mv643xx_eth.c", "mv643xx_eth_tx_timeout"], ["drivers/net/ethernet/marvell/pxa168_eth.c", "pxa168_eth_tx_timeout"], ["drivers/net/ethernet/marvell/skge.c", "skge_tx_timeout"],
["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"],
["drivers/net/ethernet/marvell/sky2.c", "sky2_tx_timeout"], ["drivers/net/ethernet/mediatek/mtk_eth_soc.c", "mtk_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx4/en_netdev.c", "mlx4_en_tx_timeout"], ["drivers/net/ethernet/mellanox/mlx5/core/en_main.c", "mlx5e_tx_timeout"], ["drivers/net/ethernet/micrel/ks8842.c", "ks8842_tx_timeout"], ["drivers/net/ethernet/micrel/ksz884x.c", "netdev_tx_timeout"], ["drivers/net/ethernet/microchip/enc28j60.c", "enc28j60_tx_timeout"], ["drivers/net/ethernet/microchip/encx24j600.c", "encx24j600_tx_timeout"], ["drivers/net/ethernet/natsemi/jazzsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/macsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/natsemi/natsemi.c", "ns_tx_timeout"], ["drivers/net/ethernet/natsemi/ns83820.c", "ns83820_tx_timeout"], ["drivers/net/ethernet/natsemi/xtsonic.c", "sonic_tx_timeout"], ["drivers/net/ethernet/neterion/s2io.c", "s2io_tx_watchdog"], ["drivers/net/ethernet/neterion/vxge/vxge-main.c", "vxge_tx_watchdog"], ["drivers/net/ethernet/netronome/nfp/nfp_net_common.c", "nfp_net_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/nvidia/forcedeth.c", "nv_tx_timeout"], ["drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c", "pch_gbe_tx_timeout"], ["drivers/net/ethernet/packetengines/hamachi.c", "hamachi_tx_timeout"], ["drivers/net/ethernet/packetengines/yellowfin.c", "yellowfin_tx_timeout"], ["drivers/net/ethernet/pensando/ionic/ionic_lif.c", "ionic_tx_timeout"], ["drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c", "netxen_tx_timeout"], ["drivers/net/ethernet/qlogic/qla3xxx.c", "ql3xxx_tx_timeout"], ["drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c", "qlcnic_tx_timeout"], ["drivers/net/ethernet/qualcomm/emac/emac.c", "emac_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_spi.c", "qcaspi_netdev_tx_timeout"], ["drivers/net/ethernet/qualcomm/qca_uart.c", "qcauart_netdev_tx_timeout"], ["drivers/net/ethernet/rdc/r6040.c", "r6040_tx_timeout"],
["drivers/net/ethernet/realtek/8139cp.c", "cp_tx_timeout"], ["drivers/net/ethernet/realtek/8139too.c", "rtl8139_tx_timeout"], ["drivers/net/ethernet/realtek/atp.c", "tx_timeout"],
["drivers/net/ethernet/realtek/r8169_main.c", "rtl8169_tx_timeout"], ["drivers/net/ethernet/renesas/ravb_main.c", "ravb_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/renesas/sh_eth.c", "sh_eth_tx_timeout"], ["drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c", "sxgbe_tx_timeout"], ["drivers/net/ethernet/seeq/ether3.c", "ether3_timeout"],
["drivers/net/ethernet/seeq/sgiseeq.c", "timeout"],
["drivers/net/ethernet/sfc/efx.c", "efx_watchdog"],
["drivers/net/ethernet/sfc/falcon/efx.c", "ef4_watchdog"],
["drivers/net/ethernet/sgi/ioc3-eth.c", "ioc3_timeout"],
["drivers/net/ethernet/sgi/meth.c", "meth_tx_timeout"],
["drivers/net/ethernet/silan/sc92031.c", "sc92031_tx_timeout"], ["drivers/net/ethernet/sis/sis190.c", "sis190_tx_timeout"],
["drivers/net/ethernet/sis/sis900.c", "sis900_tx_timeout"],
["drivers/net/ethernet/smsc/epic100.c", "epic_tx_timeout"],
["drivers/net/ethernet/smsc/smc911x.c", "smc911x_timeout"],
["drivers/net/ethernet/smsc/smc9194.c", "smc_timeout"],
["drivers/net/ethernet/smsc/smc91c92_cs.c", "smc_tx_timeout"], ["drivers/net/ethernet/smsc/smc91x.c", "smc_timeout"], ["drivers/net/ethernet/stmicro/stmmac/stmmac_main.c", "stmmac_tx_timeout"], ["drivers/net/ethernet/sun/cassini.c", "cas_tx_timeout"],
["drivers/net/ethernet/sun/ldmvsw.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/sun/niu.c", "niu_tx_timeout"],
["drivers/net/ethernet/sun/sunbmac.c", "bigmac_tx_timeout"],
["drivers/net/ethernet/sun/sungem.c", "gem_tx_timeout"],
["drivers/net/ethernet/sun/sunhme.c", "happy_meal_tx_timeout"], ["drivers/net/ethernet/sun/sunqe.c", "qe_tx_timeout"],
["drivers/net/ethernet/sun/sunvnet.c", "sunvnet_tx_timeout_common"], ["drivers/net/ethernet/synopsys/dwc-xlgmac-net.c", "xlgmac_tx_timeout"], ["drivers/net/ethernet/ti/cpmac.c", "cpmac_tx_timeout"],
["drivers/net/ethernet/ti/cpsw.c", "cpsw_ndo_tx_timeout"], ["drivers/net/ethernet/ti/davinci_emac.c", "emac_dev_tx_timeout"], ["drivers/net/ethernet/ti/netcp_core.c", "netcp_ndo_tx_timeout"], ["drivers/net/ethernet/ti/tlan.c", "tlan_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_net.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/ps3_gelic_wireless.c", "gelic_net_tx_timeout"], ["drivers/net/ethernet/toshiba/spider_net.c", "spider_net_tx_timeout"], ["drivers/net/ethernet/toshiba/tc35815.c", "tc35815_tx_timeout"], ["drivers/net/ethernet/via/via-rhine.c", "rhine_tx_timeout"], ["drivers/net/ethernet/wiznet/w5100.c", "w5100_tx_timeout"], ["drivers/net/ethernet/wiznet/w5300.c", "w5300_tx_timeout"], ["drivers/net/ethernet/xilinx/xilinx_emaclite.c", "xemaclite_tx_timeout"], ["drivers/net/ethernet/xircom/xirc2ps_cs.c", "xirc_tx_timeout"],
["drivers/net/fjes/fjes_main.c", "fjes_tx_retry"],
["drivers/net/slip/slip.c", "sl_tx_timeout"],
["drivers/net/usb/aqc111.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/asix_devices.c", "usbnet_tx_timeout"],
["drivers/net/usb/ax88172a.c", "usbnet_tx_timeout"],
["drivers/net/usb/ax88179_178a.c", "usbnet_tx_timeout"],
["drivers/net/usb/catc.c", "catc_tx_timeout"],
["drivers/net/usb/cdc_mbim.c", "usbnet_tx_timeout"],
["drivers/net/usb/cdc_ncm.c", "usbnet_tx_timeout"],
["drivers/net/usb/dm9601.c", "usbnet_tx_timeout"],
["drivers/net/usb/hso.c", "hso_net_tx_timeout"],
["drivers/net/usb/int51x1.c", "usbnet_tx_timeout"],
["drivers/net/usb/ipheth.c", "ipheth_tx_timeout"],
["drivers/net/usb/kaweth.c", "kaweth_tx_timeout"],
["drivers/net/usb/lan78xx.c", "lan78xx_tx_timeout"],
["drivers/net/usb/mcs7830.c", "usbnet_tx_timeout"],
["drivers/net/usb/pegasus.c", "pegasus_tx_timeout"],
["drivers/net/usb/qmi_wwan.c", "usbnet_tx_timeout"],
["drivers/net/usb/r8152.c", "rtl8152_tx_timeout"],
["drivers/net/usb/rndis_host.c", "usbnet_tx_timeout"],
["drivers/net/usb/rtl8150.c", "rtl8150_tx_timeout"],
["drivers/net/usb/sierra_net.c", "usbnet_tx_timeout"],
["drivers/net/usb/smsc75xx.c", "usbnet_tx_timeout"],
["drivers/net/usb/smsc95xx.c", "usbnet_tx_timeout"],
["drivers/net/usb/sr9700.c", "usbnet_tx_timeout"],
["drivers/net/usb/sr9800.c", "usbnet_tx_timeout"],
["drivers/net/usb/usbnet.c", "usbnet_tx_timeout"],
["drivers/net/vmxnet3/vmxnet3_drv.c", "vmxnet3_tx_timeout"],
["drivers/net/wan/cosa.c", "cosa_net_timeout"],
["drivers/net/wan/farsync.c", "fst_tx_timeout"],
["drivers/net/wan/fsl_ucc_hdlc.c", "uhdlc_tx_timeout"],
["drivers/net/wan/lmc/lmc_main.c", "lmc_driver_timeout"],
["drivers/net/wan/x25_asy.c", "x25_asy_timeout"],
["drivers/net/wimax/i2400m/netdev.c", "i2400m_tx_timeout"], ["drivers/net/wireless/intel/ipw2x00/ipw2100.c", "ipw2100_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/hostap/hostap_main.c", "prism2_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/main.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/orinoco/orinoco_usb.c", "orinoco_tx_timeout"], ["drivers/net/wireless/intersil/prism54/islpci_dev.c", "islpci_eth_tx_timeout"], ["drivers/net/wireless/marvell/mwifiex/main.c", "mwifiex_tx_timeout"], ["drivers/net/wireless/quantenna/qtnfmac/core.c", "qtnf_netdev_tx_timeout"], ["drivers/net/wireless/rndis_wlan.c", "usbnet_tx_timeout"],
["drivers/net/wireless/wl3501_cs.c", "wl3501_tx_timeout"],
["drivers/net/wireless/zydas/zd1201.c", "zd1201_tx_timeout"],
["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l2_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"],
["drivers/s390/net/qeth_l3_main.c", "qeth_tx_timeout"],
["drivers/staging/ks7010/ks_wlan_net.c", "ks_wlan_tx_timeout"], ["drivers/staging/qlge/qlge_main.c", "qlge_tx_timeout"], ["drivers/staging/rtl8192e/rtl8192e/rtl_core.c", "_rtl92e_tx_timeout"], ["drivers/staging/rtl8192u/r8192U_core.c", "tx_timeout"], ["drivers/staging/unisys/visornic/visornic_main.c", "visornic_xmit_timeout"], ["drivers/staging/wlan-ng/p80211netdev.c", "p80211knetdev_tx_timeout"],
["drivers/tty/n_gsm.c", "gsm_mux_net_tx_timeout"],
["drivers/tty/synclink.c", "hdlcdev_tx_timeout"],
["drivers/tty/synclink_gt.c", "hdlcdev_tx_timeout"],
["drivers/tty/synclinkmp.c", "hdlcdev_tx_timeout"],
["net/atm/lec.c", "lec_tx_timeout"],
["net/bluetooth/bnep/netdev.c", "bnep_net_timeout"]
);for my $p (@work) { my @pair = @$p; my $file = $pair[0]; my $func = $pair[1]; print STDERR $file , ": ", $func,"\n"; our @ARGV = ($file); while (<ARGV>) { if (m/($func\(struct\s+net_device\s+\*[A-Za-z_][A-Za-z-0-9]*)(\))/) { print STDERR "found $1+$2 in $file\n"; } if (s/($func\(struct\s+net_device\s+\*[A-Za-z_][A-Za-z-0-9]*)(\))/$1, int txqueue$2/) { print STDERR "$func found in $file\n"; } print; } }Result is at the bottom. If you like this approach, feel free to include as the 1st patch in your series.
Quoted 83 lines
Or we can keep the default
WARN_ONCE, but we need a minimum method implemented. We cannot get timeout directly because it needs to be implemented to get it directly.
Net core scheduler checks if this handler was implemented to throw a TX timeout. See:void __netdev_watchdog_up(struct net_device *dev) { if (dev->netdev_ops->ndo_tx_timeout) { if (dev->watchdog_timeo <= 0) dev->watchdog_timeo = 5*HZ; if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies + dev->watchdog_timeo))) dev_hold(dev); } }Quoted 57 lines
Quoted 57 lines
drivers/net/virtio_net.c +42
-0+ +schedule_work (&vi->reset_work); +} +static const struct net_device_ops virtnet_netdev = { .ndo_open = virtnet_open, .ndo_stop = virtnet_close,@@ -2593,6 +2627,7 @@ static const struct net_device_ops virtnet_netdev = { .ndo_features_check = passthru_features_check, .ndo_get_phys_port_name = virtnet_get_phys_port_name, .ndo_set_features = virtnet_set_features, + .ndo_tx_timeout = virtnet_tx_timeout, };static void virtnet_config_changed_work (struct work_struct *work)@@ -2982,6 +3017,62 @@ static int virtnet_validate(struct virtio_device *vdev)return 0 ; } +static void _remove_vq_common (struct virtnet_info *vi) +{ + vi->vdev->config->reset (vi->vdev); + +/* Free unused buffers in both send and recv, if any. */ +free_unused_bufs (vi); + +_free_receive_bufs (vi); + +free_receive_page_frags (vi); + +virtnet_del_vqs (vi); +} + +static int _virtnet_reset (struct virtnet_info *vi) +{ +struct virtio_device *vdev = vi->vdev; +int ret; + +virtio_config_disable (vdev); + vdev->failed = vdev->config->get_status (vdev) &VIRTIO_CONFIG_S_FAILED ; + +virtnet_freeze_down (vdev); +_remove_vq_common (vi); + +virtio_add_status (vdev,VIRTIO_CONFIG_S_ACKNOWLEDGE ); +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER ); + + ret =virtio_finalize_features (vdev); +if (ret) + goto err; + + ret =virtnet_restore_up (vdev); +if (ret) + goto err; + + ret =_virtnet_set_queues (vi, vi->curr_queue_pairs);Quoted 8 lines
drivers/net/virtio_net.c static int virtnet_validate(struct virtio_device *vdev) · line 3061
Quoted 5 lines
drivers/net/virtio_net.c +5
-0+if (ret) + goto err; + +virtio_add_status (vdev,VIRTIO_CONFIG_S_DRIVER_OK ); +virtio_config_enable (vdev);Is this enough? E.g. all RX mode programming has been lost.
Quoted 2 lines
IMHO virtio net has a nice performance. You can take days to see a TX timeout. If it is happening frequently, there is something wrong with device.
It is rather easy if you attach a debugger to qemu though ;)
Quoted 33 lines
So, again, IMHO I don't think it would be too problematic.
Quoted 24 lines
Quoted 24 lines
drivers/net/virtio_net.c +14
-0+return 0 ; +err: +virtio_add_status (vdev,VIRTIO_CONFIG_S_FAILED ); +return ret; +} + +static void virtnet_reset (struct work_struct *work) +{ +struct virtnet_info *vi = + container_of(work, struct virtnet_info, reset_work); + +_virtnet_reset (vi); +} +static int virtnet_probe (struct virtio_device *vdev) {int i, err = -ENOMEM ;@@ -3011,6 +3102,7 @@ static int virtnet_probe(struct virtio_device *vdev) dev->netdev_ops = &virtnet_netdev; dev->features =NETIF_F_HIGHDMA ;Quoted 6 lines
drivers/net/virtio_net.c static int virtnet_probe(struct virtio_device *vdev) · line 3108
Quoted 4 lines
drivers/net/virtio_net.c +1
-0+ dev->watchdog_timeo =5 *HZ ; dev->ethtool_ops = &virtnet_ethtool_ops;SET_NETDEV_DEV (dev, &vdev->dev);Is there a way to make this tuneable from ethtool?
Quoted 3 lines
Yes and no.
You can do that obviously, but it is not a common field to tun. If you compare with other drivers.Maybe we should just add a field specifying the timeout from the host. I'll ponder this over the weekend.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/net/virtio_net.c +1
-1@@ -3068,6 +3160,7 @@ static int virtnet_probe(struct virtio_device *vdev) vdev->priv = vi;INIT_WORK (&vi->config_work, virtnet_config_changed_work); +INIT_WORK (&vi->reset_work, virtnet_reset);/* If we can receive ANY GSO packets, we must allocate large ones. */ if (virtio_has_feature(vdev, VIRTIO_NET_F_GUEST_TSO4) || --2.17.1
--->
Quoted 9 lines
netdev: pass the stuck queue to the timeout handler
This allows incrementing the correct timeout statistic without any mess. Down the road, devices can learn to reset just the specific queue.
Signed-off-by Michael S. Tsirkin <[email protected]>---
Warning: untested.
Question...
Wouldn't be better to create a module parameter instead change the function scope?
I'm asking it because how many modules would effectively take advantage of it?
Quoted 2,982 lines
arch/m68k/emu/nfeth.c +1
-1@@ -167,7 +167,7 @@ static int nfeth_xmit(struct sk_buff *skb, struct net_device *dev)return 0 ; } -static void nfeth_tx_timeout (struct net_device *dev) +static void nfeth_tx_timeout (struct net_device *dev,int txqueue) { dev->stats.tx_errors++;netif_wake_queue (dev);arch/um/drivers/net_kern.c +1
-1@@ -247,7 +247,7 @@ static void uml_net_set_multicast_list(struct net_device *dev)return ; } -static void uml_net_tx_timeout (struct net_device *dev) +static void uml_net_tx_timeout (struct net_device *dev,int txqueue) {netif_trans_update (dev);netif_wake_queue (dev);arch/um/drivers/vector_kern.c +1
-1@@ -1298,7 +1298,7 @@ static void vector_net_set_multicast_list(struct net_device *dev)return ; } -static void vector_net_tx_timeout (struct net_device *dev) +static void vector_net_tx_timeout (struct net_device *dev,int txqueue) {struct vector_private *vp =netdev_priv (dev);arch/xtensa/platforms/iss/network.c +1
-1@@ -455,7 +455,7 @@ static void iss_net_set_multicast_list(struct net_device *dev) { } -static void iss_net_tx_timeout (struct net_device *dev) +static void iss_net_tx_timeout (struct net_device *dev,int txqueue) { }drivers/char/pcmcia/synclink_cs.c +1
-1@@ -4169,7 +4169,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {MGSLPC_INFO *info =dev_to_port (dev);unsigned long flags;drivers/infiniband/ulp/ipoib/ipoib_main.c +1
-1@@ -1182,7 +1182,7 @@ static netdev_tx_t ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void ipoib_timeout (struct net_device *dev) +static void ipoib_timeout (struct net_device *dev,int txqueue) {struct ipoib_dev_priv *priv =ipoib_priv (dev);drivers/message/fusion/mptlan.c +1
-1@@ -552,7 +552,7 @@ mpt_lan_close(struct net_device *dev)/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ /* Tx timeout handler. */ static void -mpt_lan_tx_timeout (struct net_device *dev) +mpt_lan_tx_timeout (struct net_device *dev,int txqueue) {struct mpt_lan_priv *priv =netdev_priv (dev);MPT_ADAPTER *mpt_dev = priv->mpt_dev;drivers/misc/sgi-xp/xpnet.c +1
-1@@ -496,7 +496,7 @@ xpnet_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)* Deal with transmit timeouts coming from the network layer. */ static void -xpnet_dev_tx_timeout (struct net_device *dev) +xpnet_dev_tx_timeout (struct net_device *dev,int txqueue) { dev->stats.tx_errors++; }drivers/net/appletalk/cops.c +2
-2@@ -189,7 +189,7 @@ static int cops_nodeid (struct net_device *dev, int nodeid);static irqreturn_t cops_interrupt (int irq,void *dev_id);static void cops_poll (struct timer_list *t); -static void cops_timeout (struct net_device *dev); +static void cops_timeout (struct net_device *dev,int txqueue);static void cops_rx (struct net_device *dev);static netdev_tx_t cops_send_packet (struct sk_buff *skb,struct net_device *dev);@@ -844,7 +844,7 @@ static void cops_rx(struct net_device *dev)netif_rx (skb); } -static void cops_timeout (struct net_device *dev) +static void cops_timeout (struct net_device *dev,int txqueue) {struct cops_local *lp =netdev_priv (dev);int ioaddr = dev->base_addr;drivers/net/arcnet/arcnet.c +1
-1@@ -763,7 +763,7 @@ static int go_tx(struct net_device *dev) }/* Called by the kernel when transmit times out */ -void arcnet_timeout (struct net_device *dev) +void arcnet_timeout (struct net_device *dev,int txqueue) {unsigned long flags;struct arcnet_local *lp =netdev_priv (dev);drivers/net/ethernet/3com/3c515.c +2
-2@@ -371,7 +371,7 @@ static void corkscrew_timer(struct timer_list *t);static netdev_tx_t corkscrew_start_xmit (struct sk_buff *skb,struct net_device *dev);static int corkscrew_rx (struct net_device *dev); -static void corkscrew_timeout (struct net_device *dev); +static void corkscrew_timeout (struct net_device *dev,int txqueue);static int boomerang_rx (struct net_device *dev);static irqreturn_t corkscrew_interrupt (int irq,void *dev_id);static int corkscrew_close (struct net_device *dev);@@ -961,7 +961,7 @@ static void corkscrew_timer(struct timer_list *t)#endif /* AUTOMEDIA */ } -static void corkscrew_timeout (struct net_device *dev) +static void corkscrew_timeout (struct net_device *dev,int txqueue) {int i;struct corkscrew_private *vp =netdev_priv (dev);drivers/net/ethernet/3com/3c574_cs.c +2
-2@@ -234,7 +234,7 @@ static void update_stats(struct net_device *dev);static struct net_device_stats *el3_get_stats (struct net_device *dev);static int el3_rx (struct net_device *dev,int worklimit);static int el3_close (struct net_device *dev); -static void el3_tx_timeout (struct net_device *dev); +static void el3_tx_timeout (struct net_device *dev,int txqueue);static int el3_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void set_rx_mode (struct net_device *dev);static void set_multicast_list (struct net_device *dev);@@ -690,7 +690,7 @@ static int el3_open(struct net_device *dev)return 0 ; } -static void el3_tx_timeout (struct net_device *dev) +static void el3_tx_timeout (struct net_device *dev,int txqueue) {unsigned int ioaddr = dev->base_addr;drivers/net/ethernet/3com/3c589_cs.c +2
-2@@ -173,7 +173,7 @@ static void update_stats(struct net_device *dev);static struct net_device_stats *el3_get_stats (struct net_device *dev);static int el3_rx (struct net_device *dev);static int el3_close (struct net_device *dev); -static void el3_tx_timeout (struct net_device *dev); +static void el3_tx_timeout (struct net_device *dev,int txqueue);static void set_rx_mode (struct net_device *dev);static void set_multicast_list (struct net_device *dev);static const struct ethtool_ops netdev_ethtool_ops;@@ -526,7 +526,7 @@ static int el3_open(struct net_device *dev)return 0 ; } -static void el3_tx_timeout (struct net_device *dev) +static void el3_tx_timeout (struct net_device *dev,int txqueue) {unsigned int ioaddr = dev->base_addr;drivers/net/ethernet/3com/3c59x.c +2
-2@@ -776,7 +776,7 @@ static void set_rx_mode(struct net_device *dev);#ifdef CONFIG_PCI static int vortex_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);#endif -static void vortex_tx_timeout (struct net_device *dev); +static void vortex_tx_timeout (struct net_device *dev,int txqueue);static void acpi_set_WOL (struct net_device *dev);static const struct ethtool_ops vortex_ethtool_ops;static void set_8021q_mode (struct net_device *dev,int enable);@@ -1877,7 +1877,7 @@ vortex_timer(struct timer_list *t)iowrite16 (FakeIntr, ioaddr +EL3_CMD ); } -static void vortex_tx_timeout (struct net_device *dev) +static void vortex_tx_timeout (struct net_device *dev,int txqueue) {struct vortex_private *vp =netdev_priv (dev);void __iomem *ioaddr = vp->ioaddr;drivers/net/ethernet/3com/typhoon.c +1
-1@@ -2013,7 +2013,7 @@ typhoon_stop_runtime(struct typhoon *tp, int wait_type) }static void -typhoon_tx_timeout (struct net_device *dev) +typhoon_tx_timeout (struct net_device *dev,int txqueue) {struct typhoon *tp =netdev_priv (dev);drivers/net/ethernet/8390/8390.c +1
-1@@ -36,7 +36,7 @@ void ei_set_multicast_list(struct net_device *dev) }EXPORT_SYMBOL (ei_set_multicast_list); -void ei_tx_timeout (struct net_device *dev) +void ei_tx_timeout (struct net_device *dev,int txqueue) {__ei_tx_timeout (dev); }drivers/net/ethernet/8390/8390p.c +1
-1@@ -41,7 +41,7 @@ void eip_set_multicast_list(struct net_device *dev) }EXPORT_SYMBOL (eip_set_multicast_list); -void eip_tx_timeout (struct net_device *dev) +void eip_tx_timeout (struct net_device *dev,int txqueue) {__ei_tx_timeout (dev); }drivers/net/ethernet/8390/axnet_cs.c +2
-2@@ -83,7 +83,7 @@ static netdev_tx_t axnet_start_xmit(struct sk_buff *skb, struct net_device *dev);static struct net_device_stats *get_stats (struct net_device *dev);static void set_multicast_list (struct net_device *dev); -static void axnet_tx_timeout (struct net_device *dev); +static void axnet_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t ei_irq_wrapper (int irq,void *dev_id);static void ei_watchdog (struct timer_list *t);static void axnet_reset_8390 (struct net_device *dev);@@ -903,7 +903,7 @@ static int ax_close(struct net_device *dev)* completed (or failed) - i.e. never posted a Tx related interrupt. */ -static void axnet_tx_timeout (struct net_device *dev) +static void axnet_tx_timeout (struct net_device *dev,int txqueue) {long e8390_base = dev->base_addr;struct ei_device *ei_local =netdev_priv (dev);drivers/net/ethernet/adaptec/starfire.c +2
-2@@ -576,7 +576,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);static void mdio_write (struct net_device *dev,int phy_id,int location,int value);static int netdev_open (struct net_device *dev);static void check_duplex (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t intr_handler (int irq,void *dev_instance);@@ -1105,7 +1105,7 @@ static void check_duplex(struct net_device *dev) } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base;drivers/net/ethernet/agere/et131x.c +1
-1@@ -3811,7 +3811,7 @@ static netdev_tx_t et131x_tx(struct sk_buff *skb, struct net_device *netdev)* specified by the 'tx_timeo" element in the net_device structure (see * et131x_alloc_device() to see how this value is set). */ -static void et131x_tx_timeout (struct net_device *netdev) +static void et131x_tx_timeout (struct net_device *netdev,int txqueue) {struct et131x_adapter *adapter =netdev_priv (netdev);struct tx_ring *tx_ring = &adapter->tx_ring;drivers/net/ethernet/allwinner/sun4i-emac.c +1
-1@@ -407,7 +407,7 @@ static void emac_init_device(struct net_device *dev) }/* Our watchdog timed out. Called by the networking layer */ -static void emac_timeout (struct net_device *dev) +static void emac_timeout (struct net_device *dev,int txqueue) {struct emac_board_info *db =netdev_priv (dev);unsigned long flags;drivers/net/ethernet/alteon/acenic.c +2
-2@@ -437,7 +437,7 @@ static const struct ethtool_ops ace_ethtool_ops = { .set_link_ksettings = ace_set_link_ksettings, }; -static void ace_watchdog (struct net_device *dev); +static void ace_watchdog (struct net_device *dev,int txqueue);static const struct net_device_ops ace_netdev_ops = { .ndo_open = ace_open,@@ -1542,7 +1542,7 @@ static void ace_set_rxtx_parms(struct net_device *dev, int jumbo) } -static void ace_watchdog (struct net_device *data) +static void ace_watchdog (struct net_device *data,int txqueue) {struct net_device *dev = data;struct ace_private *ap =netdev_priv (dev);drivers/net/ethernet/amazon/ena/ena_netdev.c +1
-1@@ -78,7 +78,7 @@ static void check_for_admin_com_state(struct ena_adapter *adapter);static void ena_destroy_device (struct ena_adapter *adapter,bool graceful);static int ena_restore_device (struct ena_adapter *adapter); -static void ena_tx_timeout (struct net_device *dev) +static void ena_tx_timeout (struct net_device *dev,int txqueue) {struct ena_adapter *adapter =netdev_priv (dev);drivers/net/ethernet/amd/a2065.c +1
-1@@ -522,7 +522,7 @@ static inline int lance_reset(struct net_device *dev)return status; } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;drivers/net/ethernet/amd/am79c961a.c +1
-1@@ -422,7 +422,7 @@ static void am79c961_setmulticastlist (struct net_device *dev)spin_unlock_irqrestore (&priv->chip_lock, flags); } -static void am79c961_timeout (struct net_device *dev) +static void am79c961_timeout (struct net_device *dev,int txqueue) {printk (KERN_WARNING "%s: transmit timed out, network cable problem?\n" , dev->name);drivers/net/ethernet/amd/amd8111e.c +1
-1@@ -1569,7 +1569,7 @@ static int amd8111e_enable_link_change(struct amd8111e_priv *lp)* failed or the interface is locked up. This function will reinitialize * the hardware. */ -static void amd8111e_tx_timeout (struct net_device *dev) +static void amd8111e_tx_timeout (struct net_device *dev,int txqueue) {struct amd8111e_priv *lp =netdev_priv (dev);int err;drivers/net/ethernet/amd/ariadne.c +1
-1@@ -530,7 +530,7 @@ static inline void ariadne_reset(struct net_device *dev)netif_start_queue (dev); } -static void ariadne_tx_timeout (struct net_device *dev) +static void ariadne_tx_timeout (struct net_device *dev,int txqueue) {volatile struct Am79C960 *lance = (struct Am79C960 *)dev->base_addr;drivers/net/ethernet/amd/au1000_eth.c +1
-1@@ -1014,7 +1014,7 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev)* The Tx ring has been full longer than the watchdog timeout * value. The transmitter must be hung? */ -static void au1000_tx_timeout (struct net_device *dev) +static void au1000_tx_timeout (struct net_device *dev,int txqueue) {netdev_err (dev,"au1000_tx_timeout: dev=%p\n" , dev);au1000_reset_mac (dev);drivers/net/ethernet/amd/declance.c +1
-1@@ -884,7 +884,7 @@ static inline int lance_reset(struct net_device *dev)return status; } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);volatile struct lance_regs *ll = lp->ll;drivers/net/ethernet/amd/ni65.c +2
-2@@ -254,7 +254,7 @@ static int ni65_lance_reinit(struct net_device *dev);static void ni65_init_lance (struct priv *p,unsigned char *,int ,int );static netdev_tx_t ni65_send_packet (struct sk_buff *skb,struct net_device *dev); -static void ni65_timeout (struct net_device *dev); +static void ni65_timeout (struct net_device *dev,int txqueue);static int ni65_close (struct net_device *dev);static int ni65_alloc_buffer (struct net_device *dev);static void ni65_free_buffer (struct priv *p);@@ -1133,7 +1133,7 @@ static void ni65_recv_intr(struct net_device *dev,int csr0)* kick xmitter .. */ -static void ni65_timeout (struct net_device *dev) +static void ni65_timeout (struct net_device *dev,int txqueue) {int i;struct priv *p = dev->ml_priv;drivers/net/ethernet/amd/nmclan_cs.c +2
-2@@ -407,7 +407,7 @@ static int mace_open(struct net_device *dev);static int mace_close (struct net_device *dev);static netdev_tx_t mace_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void mace_tx_timeout (struct net_device *dev); +static void mace_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t mace_interrupt (int irq,void *dev_id);static struct net_device_stats *mace_get_stats (struct net_device *dev);static int mace_rx (struct net_device *dev,unsigned char RxCnt);@@ -837,7 +837,7 @@ mace_start_xmitfailed, put skb back into a list." ---------------------------------------------------------------------------- */ -static void mace_tx_timeout (struct net_device *dev) +static void mace_tx_timeout (struct net_device *dev,int txqueue) {mace_private *lp =netdev_priv (dev);struct pcmcia_device *link = lp->p_dev;drivers/net/ethernet/amd/pcnet32.c +2
-2@@ -314,7 +314,7 @@ static int pcnet32_open(struct net_device *);static int pcnet32_init_ring (struct net_device *);static netdev_tx_t pcnet32_start_xmit (struct sk_buff *,struct net_device *); -static void pcnet32_tx_timeout (struct net_device *dev); +static void pcnet32_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t pcnet32_interrupt (int ,void *);static int pcnet32_close (struct net_device *);static struct net_device_stats *pcnet32_get_stats (struct net_device *);@@ -2455,7 +2455,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits) lp->a->write_csr (ioaddr,CSR0 , csr0_bits); } -static void pcnet32_tx_timeout (struct net_device *dev) +static void pcnet32_tx_timeout (struct net_device *dev,int txqueue) {struct pcnet32_private *lp =netdev_priv (dev);unsigned long ioaddr = dev->base_addr, flags;drivers/net/ethernet/amd/sunlance.c +1
-1@@ -1097,7 +1097,7 @@ static void lance_piozero(void __iomem *dest, int len)sbus_writeb (0 , piobuf); } -static void lance_tx_timeout (struct net_device *dev) +static void lance_tx_timeout (struct net_device *dev,int txqueue) {struct lance_private *lp =netdev_priv (dev);drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1
-1@@ -2152,7 +2152,7 @@ static int xgbe_change_mtu(struct net_device *netdev, int mtu)return 0 ; } -static void xgbe_tx_timeout (struct net_device *netdev) +static void xgbe_tx_timeout (struct net_device *netdev,int txqueue) {struct xgbe_prv_data *pdata =netdev_priv (netdev);drivers/net/ethernet/apm/xgene-v2/main.c +1
-1@@ -575,7 +575,7 @@ static void xge_free_pending_skb(struct net_device *ndev) } } -static void xge_timeout (struct net_device *ndev) +static void xge_timeout (struct net_device *ndev,int txqueue) {struct xge_pdata *pdata =netdev_priv (ndev);drivers/net/ethernet/apm/xgene/xgene_enet_main.c +1
-1@@ -859,7 +859,7 @@ static int xgene_enet_napi(struct napi_struct *napi, const int budget)return processed; } -static void xgene_enet_timeout (struct net_device *ndev) +static void xgene_enet_timeout (struct net_device *ndev,int txqueue) {struct xgene_enet_pdata *pdata =netdev_priv (ndev);struct netdev_queue *txq;drivers/net/ethernet/apple/macmace.c +2
-2@@ -91,7 +91,7 @@ static int mace_set_address(struct net_device *dev, void *addr);static void mace_reset (struct net_device *dev);static irqreturn_t mace_interrupt (int irq,void *dev_id);static irqreturn_t mace_dma_intr (int irq,void *dev_id); -static void mace_tx_timeout (struct net_device *dev); +static void mace_tx_timeout (struct net_device *dev,int txqueue);static void __mace_set_address (struct net_device *dev,void *addr);/* @@ -600,7 +600,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static void mace_tx_timeout (struct net_device *dev) +static void mace_tx_timeout (struct net_device *dev,int txqueue) {struct mace_data *mp =netdev_priv (dev);volatile struct mace *mb = mp->mace;drivers/net/ethernet/atheros/ag71xx.c +1
-1@@ -1409,7 +1409,7 @@ static void ag71xx_oom_timer_handler(struct timer_list *t)napi_schedule (&ag->napi); } -static void ag71xx_tx_timeout (struct net_device *ndev) +static void ag71xx_tx_timeout (struct net_device *ndev,int txqueue) {struct ag71xx *ag =netdev_priv (ndev);drivers/net/ethernet/atheros/alx/main.c +1
-1@@ -1553,7 +1553,7 @@ static netdev_tx_t alx_start_xmit(struct sk_buff *skb,return alx_start_xmit_ring (skb,alx_tx_queue_mapping (alx, skb)); } -static void alx_tx_timeout (struct net_device *dev) +static void alx_tx_timeout (struct net_device *dev,int txqueue) {struct alx_priv *alx =netdev_priv (dev);drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1
-1@@ -350,7 +350,7 @@ static void atl1c_del_timer(struct atl1c_adapter *adapter)* atl1c_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl1c_tx_timeout (struct net_device *netdev) +static void atl1c_tx_timeout (struct net_device *netdev,int txqueue) {struct atl1c_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/atheros/atl1e/atl1e_main.c +1
-1@@ -251,7 +251,7 @@ static void atl1e_cancel_work(struct atl1e_adapter *adapter)* atl1e_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl1e_tx_timeout (struct net_device *netdev) +static void atl1e_tx_timeout (struct net_device *netdev,int txqueue) {struct atl1e_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/atheros/atlx/atl2.c +1
-1@@ -1001,7 +1001,7 @@ static int atl2_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)* atl2_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void atl2_tx_timeout (struct net_device *netdev) +static void atl2_tx_timeout (struct net_device *netdev,int txqueue) {struct atl2_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/broadcom/b44.c +1
-1@@ -951,7 +951,7 @@ static irqreturn_t b44_interrupt(int irq, void *dev_id)return IRQ_RETVAL (handled); } -static void b44_tx_timeout (struct net_device *dev) +static void b44_tx_timeout (struct net_device *dev,int txqueue) {struct b44 *bp =netdev_priv (dev);drivers/net/ethernet/broadcom/bcmsysport.c +1
-1@@ -1354,7 +1354,7 @@ static netdev_tx_t bcm_sysport_xmit(struct sk_buff *skb,return ret; } -static void bcm_sysport_tx_timeout (struct net_device *dev) +static void bcm_sysport_tx_timeout (struct net_device *dev,int txqueue) {netdev_warn (dev,"transmit timeout!\n" );drivers/net/ethernet/broadcom/bnx2.c +1
-1@@ -6575,7 +6575,7 @@ bnx2_dump_state(struct bnx2 *bp) }static void -bnx2_tx_timeout (struct net_device *dev) +bnx2_tx_timeout (struct net_device *dev,int txqueue) {struct bnx2 *bp =netdev_priv (dev);drivers/net/ethernet/broadcom/bnxt/bnxt.c +1
-1@@ -9936,7 +9936,7 @@ static void bnxt_reset_task(struct bnxt *bp, bool silent) } } -static void bnxt_tx_timeout (struct net_device *dev) +static void bnxt_tx_timeout (struct net_device *dev,int txqueue) {struct bnxt *bp =netdev_priv (dev);drivers/net/ethernet/broadcom/genet/bcmgenet.c +1
-1@@ -3053,7 +3053,7 @@ static void bcmgenet_dump_tx_queue(struct bcmgenet_tx_ring *ring) ring->cb_ptr, ring->end_ptr); } -static void bcmgenet_timeout (struct net_device *dev) +static void bcmgenet_timeout (struct net_device *dev,int txqueue) {struct bcmgenet_priv *priv =netdev_priv (dev);u32 int0_enable =0 ;drivers/net/ethernet/broadcom/tg3.c +1
-1@@ -7645,7 +7645,7 @@ static void tg3_poll_controller(struct net_device *dev) }#endif -static void tg3_tx_timeout (struct net_device *dev) +static void tg3_tx_timeout (struct net_device *dev,int txqueue) {struct tg3 *tp =netdev_priv (dev);drivers/net/ethernet/calxeda/xgmac.c +1
-1@@ -1251,7 +1251,7 @@ static int xgmac_poll(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void xgmac_tx_timeout (struct net_device *dev) +static void xgmac_tx_timeout (struct net_device *dev,int txqueue) {struct xgmac_priv *priv =netdev_priv (dev);schedule_work (&priv->tx_timeout_work);drivers/net/ethernet/cavium/liquidio/lio_main.c +1
-1@@ -2562,7 +2562,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)/** \brief Network device Tx timeout * @param netdev pointer to network device */ -static void liquidio_tx_timeout (struct net_device *netdev) +static void liquidio_tx_timeout (struct net_device *netdev,int txqueue) {struct lio *lio;drivers/net/ethernet/cavium/liquidio/lio_vf_main.c +1
-1@@ -1628,7 +1628,7 @@ static netdev_tx_t liquidio_xmit(struct sk_buff *skb, struct net_device *netdev)/** \brief Network device Tx timeout * @param netdev pointer to network device */ -static void liquidio_tx_timeout (struct net_device *netdev) +static void liquidio_tx_timeout (struct net_device *netdev,int txqueue) {struct lio *lio;drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c +2
-2@@ -31,7 +31,7 @@ static int lio_vf_rep_open(struct net_device *ndev);static int lio_vf_rep_stop (struct net_device *ndev);static netdev_tx_t lio_vf_rep_pkt_xmit (struct sk_buff *skb,struct net_device *ndev); -static void lio_vf_rep_tx_timeout (struct net_device *netdev); +static void lio_vf_rep_tx_timeout (struct net_device *netdev,int txqueue);static int lio_vf_rep_phys_port_name (struct net_device *dev,char *buf,size_t len); static void lio_vf_rep_get_stats64(struct net_device *dev,@@ -172,7 +172,7 @@ lio_vf_rep_stop(struct net_device *ndev) }static void -lio_vf_rep_tx_timeout (struct net_device *ndev) +lio_vf_rep_tx_timeout (struct net_device *ndev,int txqueue) {netif_trans_update (ndev);drivers/net/ethernet/cavium/thunder/nicvf_main.c +1
-1@@ -1741,7 +1741,7 @@ static void nicvf_get_stats64(struct net_device *netdev, } -static void nicvf_tx_timeout (struct net_device *dev) +static void nicvf_tx_timeout (struct net_device *dev,int txqueue) {struct nicvf *nic =netdev_priv (dev);drivers/net/ethernet/cirrus/cs89x0.c +1
-1@@ -1128,7 +1128,7 @@ net_get_stats(struct net_device *dev)return &dev->stats; } -static void net_timeout (struct net_device *dev) +static void net_timeout (struct net_device *dev,int txqueue) {/* If we get here, some higher level has decided we are broken. There should really be a "kick me" function call instead. */ drivers/net/ethernet/cisco/enic/enic_main.c +1
-1@@ -1095,7 +1095,7 @@ static void enic_set_rx_mode(struct net_device *netdev) }/* netif_tx_lock held, BHs disabled */ -static void enic_tx_timeout (struct net_device *netdev) +static void enic_tx_timeout (struct net_device *netdev,int txqueue) {struct enic *enic =netdev_priv (netdev);schedule_work (&enic->tx_hang_reset);drivers/net/ethernet/cortina/gemini.c +1
-1@@ -1296,7 +1296,7 @@ static int gmac_start_xmit(struct sk_buff *skb, struct net_device *netdev)return NETDEV_TX_OK ; } -static void gmac_tx_timeout (struct net_device *netdev) +static void gmac_tx_timeout (struct net_device *netdev,int txqueue) {netdev_err (netdev,"Tx timeout\n" );gmac_dump_dma_state (netdev);drivers/net/ethernet/davicom/dm9000.c +1
-1@@ -964,7 +964,7 @@ dm9000_init_dm9000(struct net_device *dev) }/* Our watchdog timed out. Called by the networking layer */ -static void dm9000_timeout (struct net_device *dev) +static void dm9000_timeout (struct net_device *dev,int txqueue) {struct board_info *db =netdev_priv (dev);u8 reg_save;drivers/net/ethernet/dec/tulip/tulip_core.c +2
-2@@ -255,7 +255,7 @@ MODULE_DEVICE_TABLE(pci, tulip_pci_tbl);const char tulip_media_cap[32 ] = {0 ,0 ,0 ,16 ,3 ,19 ,16 ,24 ,27 ,4 ,7 ,5 ,0 ,20 ,23 ,20 ,28 ,31 ,0 ,0 , }; -static void tulip_tx_timeout (struct net_device *dev); +static void tulip_tx_timeout (struct net_device *dev,int txqueue);static void tulip_init_ring (struct net_device *dev);static void tulip_free_ring (struct net_device *dev); static netdev_tx_t tulip_start_xmit(struct sk_buff *skb,@@ -534,7 +534,7 @@ tulip_open(struct net_device *dev) } -static void tulip_tx_timeout (struct net_device *dev) +static void tulip_tx_timeout (struct net_device *dev,int txqueue) {struct tulip_private *tp =netdev_priv (dev);void __iomem *ioaddr = tp->base_addr;drivers/net/ethernet/dec/tulip/winbond-840.c +2
-2@@ -331,7 +331,7 @@ static void netdev_timer(struct timer_list *t);static void init_rxtx_rings (struct net_device *dev);static void free_rxtx_rings (struct netdev_private *np);static void init_registers (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static int alloc_ringdesc (struct net_device *dev);static void free_ringdesc (struct netdev_private *np);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);@@ -921,7 +921,7 @@ static void init_registers(struct net_device *dev)iowrite32 (0 , ioaddr + RxStartDemand); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base_addr;drivers/net/ethernet/dlink/sundance.c +2
-2@@ -432,7 +432,7 @@ static int mdio_wait_link(struct net_device *dev, int wait);static int netdev_open (struct net_device *dev);static void check_duplex (struct net_device *dev);static void netdev_timer (struct timer_list *t); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static int reset_tx (struct net_device *dev);@@ -969,7 +969,7 @@ static void netdev_timer(struct timer_list *t)add_timer (&np->timer); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->base;drivers/net/ethernet/emulex/benet/be_main.c +1
-1@@ -1417,7 +1417,7 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, struct net_device *netdev)return NETDEV_TX_OK ; } -static void be_tx_timeout (struct net_device *netdev) +static void be_tx_timeout (struct net_device *netdev,int txqueue) {struct be_adapter *adapter =netdev_priv (netdev);struct device *dev = &adapter->pdev->dev;drivers/net/ethernet/ethoc.c +1
-1@@ -869,7 +869,7 @@ static int ethoc_change_mtu(struct net_device *dev, int new_mtu)return -ENOSYS ; } -static void ethoc_tx_timeout (struct net_device *dev) +static void ethoc_tx_timeout (struct net_device *dev,int txqueue) {struct ethoc *priv =netdev_priv (dev);u32 pending =ethoc_read (priv,INT_SOURCE );drivers/net/ethernet/faraday/ftgmac100.c +1
-1@@ -1542,7 +1542,7 @@ static int ftgmac100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, intreturn phy_mii_ioctl (netdev->phydev, ifr, cmd); } -static void ftgmac100_tx_timeout (struct net_device *netdev) +static void ftgmac100_tx_timeout (struct net_device *netdev,int txqueue) {struct ftgmac100 *priv =netdev_priv (netdev);drivers/net/ethernet/fealnx.c +2
-2@@ -428,7 +428,7 @@ static void getlinktype(struct net_device *dev);static void getlinkstatus (struct net_device *dev);static void netdev_timer (struct timer_list *t);static void reset_timer (struct timer_list *t); -static void fealnx_tx_timeout (struct net_device *dev); +static void fealnx_tx_timeout (struct net_device *dev,int txqueue);static void init_ring (struct net_device *dev);static netdev_tx_t start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t intr_handler (int irq,void *dev_instance);@@ -1191,7 +1191,7 @@ static void reset_timer(struct timer_list *t) } -static void fealnx_tx_timeout (struct net_device *dev) +static void fealnx_tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem *ioaddr = np->mem;drivers/net/ethernet/freescale/fec_main.c +1
-1@@ -1141,7 +1141,7 @@ fec_stop(struct net_device *ndev)static void -fec_timeout (struct net_device *ndev) +fec_timeout (struct net_device *ndev,int txqueue) {struct fec_enet_private *fep =netdev_priv (ndev);drivers/net/ethernet/freescale/fec_mpc52xx.c +1
-1@@ -84,7 +84,7 @@ static int debug = -1; /* the above default */module_param (debug, int,0 );MODULE_PARM_DESC (debug,"debugging messages level" ); -static void mpc52xx_fec_tx_timeout (struct net_device *dev) +static void mpc52xx_fec_tx_timeout (struct net_device *dev,int txqueue) {struct mpc52xx_fec_priv *priv =netdev_priv (dev);unsigned long flags;drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c +1
-1@@ -641,7 +641,7 @@ static void fs_timeout_work(struct work_struct *work)netif_wake_queue (dev); } -static void fs_timeout (struct net_device *dev) +static void fs_timeout (struct net_device *dev,int txqueue) {struct fs_enet_private *fep =netdev_priv (dev);drivers/net/ethernet/freescale/gianfar.c +1
-1@@ -2092,7 +2092,7 @@ static void gfar_reset_task(struct work_struct *work)reset_gfar (priv->ndev); } -static void gfar_timeout (struct net_device *dev) +static void gfar_timeout (struct net_device *dev,int txqueue) {struct gfar_private *priv =netdev_priv (dev);drivers/net/ethernet/freescale/ucc_geth.c +1
-1@@ -3545,7 +3545,7 @@ static void ucc_geth_timeout_work(struct work_struct *work)* ucc_geth_timeout gets called when a packet has not been * transmitted after a set amount of time. */ -static void ucc_geth_timeout (struct net_device *dev) +static void ucc_geth_timeout (struct net_device *dev,int txqueue) {struct ucc_geth_private *ugeth =netdev_priv (dev);drivers/net/ethernet/fujitsu/fmvj18x_cs.c +2
-2@@ -93,7 +93,7 @@ static irqreturn_t fjn_interrupt(int irq, void *dev_id);static void fjn_rx (struct net_device *dev);static void fjn_reset (struct net_device *dev);static void set_rx_mode (struct net_device *dev); -static void fjn_tx_timeout (struct net_device *dev); +static void fjn_tx_timeout (struct net_device *dev,int txqueue);static const struct ethtool_ops netdev_ethtool_ops;/* @@ -774,7 +774,7 @@ static irqreturn_t fjn_interrupt(int dummy, void *dev_id)/*====================================================================*/ -static void fjn_tx_timeout (struct net_device *dev) +static void fjn_tx_timeout (struct net_device *dev,int txqueue) {struct local_info *lp =netdev_priv (dev);unsigned int ioaddr = dev->base_addr;drivers/net/ethernet/google/gve/gve_main.c +1
-1@@ -844,7 +844,7 @@ static void gve_turnup(struct gve_priv *priv)gve_set_napi_enabled (priv); } -static void gve_tx_timeout (struct net_device *dev) +static void gve_tx_timeout (struct net_device *dev,int txqueue) {struct gve_priv *priv =netdev_priv (dev);drivers/net/ethernet/hisilicon/hip04_eth.c +1
-1@@ -779,7 +779,7 @@ static int hip04_mac_stop(struct net_device *ndev)return 0 ; } -static void hip04_timeout (struct net_device *ndev) +static void hip04_timeout (struct net_device *ndev,int txqueue) {struct hip04_priv *priv =netdev_priv (ndev);drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +1
-1@@ -893,7 +893,7 @@ static void hix5hd2_tx_timeout_task(struct work_struct *work)hix5hd2_net_open (priv->netdev); } -static void hix5hd2_net_timeout (struct net_device *dev) +static void hix5hd2_net_timeout (struct net_device *dev,int txqueue) {struct hix5hd2_priv *priv =netdev_priv (dev);drivers/net/ethernet/hisilicon/hns/hns_enet.c +1
-1@@ -1485,7 +1485,7 @@ static int hns_nic_net_stop(struct net_device *ndev)static void hns_tx_timeout_reset (struct hns_nic_priv *priv);#define HNS_TX_TIMEO_LIMIT (40 * HZ) -static void hns_nic_net_timeout (struct net_device *ndev) +static void hns_nic_net_timeout (struct net_device *ndev,int txqueue) {struct hns_nic_priv *priv =netdev_priv (ndev);drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +1
-1@@ -1764,7 +1764,7 @@ static bool hns3_get_tx_timeo_queue_info(struct net_device *ndev)return true; } -static void hns3_nic_net_timeout (struct net_device *ndev) +static void hns3_nic_net_timeout (struct net_device *ndev,int txqueue) {struct hns3_nic_priv *priv =netdev_priv (ndev);struct hnae3_handle *h = priv->ae_handle;drivers/net/ethernet/huawei/hinic/hinic_main.c +1
-1@@ -766,7 +766,7 @@ static void hinic_set_rx_mode(struct net_device *netdev)queue_work (nic_dev->workq, &rx_mode_work->work); } -static void hinic_tx_timeout (struct net_device *netdev) +static void hinic_tx_timeout (struct net_device *netdev,int txqueue) {struct hinic_dev *nic_dev =netdev_priv (netdev);drivers/net/ethernet/i825xx/ether1.c +2
-2@@ -66,7 +66,7 @@ static netdev_tx_t ether1_sendpacket(struct sk_buff *skb,static irqreturn_t ether1_interrupt (int irq,void *dev_id);static int ether1_close (struct net_device *dev);static void ether1_setmulticastlist (struct net_device *dev); -static void ether1_timeout (struct net_device *dev); +static void ether1_timeout (struct net_device *dev,int txqueue);/* ------------------------------------------------------------------------- */ @@ -650,7 +650,7 @@ ether1_open (struct net_device *dev) }static void -ether1_timeout (struct net_device *dev) +ether1_timeout (struct net_device *dev,int txqueue) {printk (KERN_WARNING "%s: transmit timeout, network cable problem?\n" , dev->name);drivers/net/ethernet/i825xx/sun3_82586.c +2
-2@@ -125,7 +125,7 @@ static netdev_tx_t sun3_82586_send_packet(struct sk_buff *, struct net_device *);static struct net_device_stats *sun3_82586_get_stats (struct net_device *dev);static void set_multicast_list (struct net_device *dev); -static void sun3_82586_timeout (struct net_device *dev); +static void sun3_82586_timeout (struct net_device *dev,int txqueue);#if 0 static void sun3_82586_dump (struct net_device *,void *);#endif @@ -965,7 +965,7 @@ static void startrecv586(struct net_device *dev)WAIT_4_SCB_CMD_RUC ();/* wait for accept cmd. (no timeout!!) */ } -static void sun3_82586_timeout (struct net_device *dev) +static void sun3_82586_timeout (struct net_device *dev,int txqueue) {struct priv *p =netdev_priv (dev);#ifndef NO_NOPCOMMANDS drivers/net/ethernet/ibm/ehea/ehea_main.c +1
-1@@ -2786,7 +2786,7 @@ static void ehea_rereg_mrs(void)return ; } -static void ehea_tx_watchdog (struct net_device *dev) +static void ehea_tx_watchdog (struct net_device *dev,int txqueue) {struct ehea_port *port =netdev_priv (dev);drivers/net/ethernet/ibm/emac/core.c +1
-1@@ -776,7 +776,7 @@ static void emac_reset_work(struct work_struct *work)mutex_unlock (&dev->link_lock); } -static void emac_tx_timeout (struct net_device *ndev) +static void emac_tx_timeout (struct net_device *ndev,int txqueue) {struct emac_instance *dev =netdev_priv (ndev);drivers/net/ethernet/ibm/ibmvnic.c +1
-1@@ -2189,7 +2189,7 @@ static int ibmvnic_reset(struct ibmvnic_adapter *adapter,return -ret; } -static void ibmvnic_tx_timeout (struct net_device *dev) +static void ibmvnic_tx_timeout (struct net_device *dev,int txqueue) {struct ibmvnic_adapter *adapter =netdev_priv (dev);drivers/net/ethernet/intel/e100.c +1
-1@@ -2316,7 +2316,7 @@ static void e100_down(struct nic *nic)e100_rx_clean_list (nic); } -static void e100_tx_timeout (struct net_device *netdev) +static void e100_tx_timeout (struct net_device *netdev,int txqueue) {struct nic *nic =netdev_priv (netdev);drivers/net/ethernet/intel/e1000/e1000_main.c +2
-2@@ -134,7 +134,7 @@ static int e1000_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);static void e1000_enter_82542_rst (struct e1000_adapter *adapter);static void e1000_leave_82542_rst (struct e1000_adapter *adapter); -static void e1000_tx_timeout (struct net_device *dev); +static void e1000_tx_timeout (struct net_device *dev,int txqueue);static void e1000_reset_task (struct work_struct *work);static void e1000_smartspeed (struct e1000_adapter *adapter); static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter,@@ -3488,7 +3488,7 @@ static void e1000_dump(struct e1000_adapter *adapter)* e1000_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void e1000_tx_timeout (struct net_device *netdev) +static void e1000_tx_timeout (struct net_device *netdev,int txqueue) {struct e1000_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/intel/e1000e/netdev.c +1
-1@@ -5926,7 +5926,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,* e1000_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void e1000_tx_timeout (struct net_device *netdev) +static void e1000_tx_timeout (struct net_device *netdev,int txqueue) {struct e1000_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/intel/fm10k/fm10k_netdev.c +1
-1@@ -697,7 +697,7 @@ static netdev_tx_t fm10k_xmit_frame(struct sk_buff *skb, struct net_device *dev)* fm10k_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void fm10k_tx_timeout (struct net_device *netdev) +static void fm10k_tx_timeout (struct net_device *netdev,int txqueue) {struct fm10k_intfc *interface =netdev_priv (netdev);bool real_tx_hang = false;drivers/net/ethernet/intel/i40e/i40e_main.c +1
-1@@ -301,7 +301,7 @@ void i40e_service_event_schedule(struct i40e_pf *pf)* device is munged, not just the one netdev port, so go for the full * reset. **/ -static void i40e_tx_timeout (struct net_device *netdev) +static void i40e_tx_timeout (struct net_device *netdev,int txqueue) {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_vsi *vsi = np->vsi;drivers/net/ethernet/intel/iavf/iavf_main.c +1
-1@@ -159,7 +159,7 @@ void iavf_schedule_reset(struct iavf_adapter *adapter)* iavf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void iavf_tx_timeout (struct net_device *netdev) +static void iavf_tx_timeout (struct net_device *netdev,int txqueue) {struct iavf_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/intel/ice/ice_main.c +1
-1@@ -4627,7 +4627,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,* ice_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure */ -static void ice_tx_timeout (struct net_device *netdev) +static void ice_tx_timeout (struct net_device *netdev,int txqueue) {struct ice_netdev_priv *np =netdev_priv (netdev);struct ice_ring *tx_ring =NULL ;drivers/net/ethernet/intel/igb/igb_main.c +1
-1@@ -6173,7 +6173,7 @@ static netdev_tx_t igb_xmit_frame(struct sk_buff *skb,* igb_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void igb_tx_timeout (struct net_device *netdev) +static void igb_tx_timeout (struct net_device *netdev,int txqueue) {struct igb_adapter *adapter =netdev_priv (netdev);struct e1000_hw *hw = &adapter->hw;drivers/net/ethernet/intel/igbvf/netdev.c +1
-1@@ -2375,7 +2375,7 @@ static netdev_tx_t igbvf_xmit_frame(struct sk_buff *skb,* igbvf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void igbvf_tx_timeout (struct net_device *netdev) +static void igbvf_tx_timeout (struct net_device *netdev,int txqueue) {struct igbvf_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/intel/ixgb/ixgb_main.c +2
-2@@ -70,7 +70,7 @@ static int ixgb_clean(struct napi_struct *, int);static bool ixgb_clean_rx_irq (struct ixgb_adapter *,int *,int );static void ixgb_alloc_rx_buffers (struct ixgb_adapter *,int ); -static void ixgb_tx_timeout (struct net_device *dev); +static void ixgb_tx_timeout (struct net_device *dev,int txqueue);static void ixgb_tx_timeout_task (struct work_struct *work);static void ixgb_vlan_strip_enable (struct ixgb_adapter *adapter);@@ -1538,7 +1538,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)**/ static void -ixgb_tx_timeout (struct net_device *netdev) +ixgb_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgb_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c +1
-1@@ -166,7 +166,7 @@ static ssize_t ixgbe_dbg_netdev_ops_write(struct file *filp, ixgbe_dbg_netdev_ops_buf[len] ='\0' ;if (strncmp (ixgbe_dbg_netdev_ops_buf,"tx_timeout" ,10 ) ==0 ) { - adapter->netdev->netdev_ops->ndo_tx_timeout (adapter->netdev); + adapter->netdev->netdev_ops->ndo_tx_timeout (adapter->netdev,-1 );e_dev_info ("tx_timeout called\n" ); }else {e_dev_info ("Unknown command: %s\n" , ixgbe_dbg_netdev_ops_buf);drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +1
-1@@ -6158,7 +6158,7 @@ static void ixgbe_set_eee_capable(struct ixgbe_adapter *adapter)* ixgbe_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void ixgbe_tx_timeout (struct net_device *netdev) +static void ixgbe_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgbe_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +1
-1@@ -250,7 +250,7 @@ static void ixgbevf_tx_timeout_reset(struct ixgbevf_adapter *adapter)* ixgbevf_tx_timeout - Respond to a Tx Hang * @netdev: network interface device structure **/ -static void ixgbevf_tx_timeout (struct net_device *netdev) +static void ixgbevf_tx_timeout (struct net_device *netdev,int txqueue) {struct ixgbevf_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/jme.c +1
-1@@ -2337,7 +2337,7 @@ jme_change_mtu(struct net_device *netdev, int new_mtu) }static void -jme_tx_timeout (struct net_device *netdev) +jme_tx_timeout (struct net_device *netdev,int txqueue) {struct jme_adapter *jme =netdev_priv (netdev);drivers/net/ethernet/korina.c +1
-1@@ -917,7 +917,7 @@ static void korina_restart_task(struct work_struct *work)enable_irq (lp->rx_irq); } -static void korina_tx_timeout (struct net_device *dev) +static void korina_tx_timeout (struct net_device *dev,int txqueue) {struct korina_private *lp =netdev_priv (dev);drivers/net/ethernet/lantiq_etop.c +1
-1@@ -594,7 +594,7 @@ ltq_etop_init(struct net_device *dev) }static void -ltq_etop_tx_timeout (struct net_device *dev) +ltq_etop_tx_timeout (struct net_device *dev,int txqueue) {int err;drivers/net/ethernet/marvell/mv643xx_eth.c +1
-1@@ -2590,7 +2590,7 @@ static void tx_timeout_task(struct work_struct *ugly) } } -static void mv643xx_eth_tx_timeout (struct net_device *dev) +static void mv643xx_eth_tx_timeout (struct net_device *dev,int txqueue) {struct mv643xx_eth_private *mp =netdev_priv (dev);drivers/net/ethernet/marvell/pxa168_eth.c +1
-1@@ -742,7 +742,7 @@ static int txq_reclaim(struct net_device *dev, int force)return released; } -static void pxa168_eth_tx_timeout (struct net_device *dev) +static void pxa168_eth_tx_timeout (struct net_device *dev,int txqueue) {struct pxa168_eth_private *pep =netdev_priv (dev);drivers/net/ethernet/marvell/skge.c +1
-1@@ -2884,7 +2884,7 @@ static void skge_tx_clean(struct net_device *dev) skge->tx_ring.to_clean = e; } -static void skge_tx_timeout (struct net_device *dev) +static void skge_tx_timeout (struct net_device *dev,int txqueue) {struct skge_port *skge =netdev_priv (dev);drivers/net/ethernet/marvell/sky2.c +1
-1@@ -2358,7 +2358,7 @@ static void sky2_qlink_intr(struct sky2_hw *hw)/* Transmit timeout is only called if we are running, carrier is up * and tx queue is full (stopped). */ -static void sky2_tx_timeout (struct net_device *dev) +static void sky2_tx_timeout (struct net_device *dev,int txqueue) {struct sky2_port *sky2 =netdev_priv (dev);struct sky2_hw *hw = sky2->hw;drivers/net/ethernet/mediatek/mtk_eth_soc.c +1
-1@@ -2083,7 +2083,7 @@ static void mtk_dma_free(struct mtk_eth *eth)kfree (eth->scratch_head); } -static void mtk_tx_timeout (struct net_device *dev) +static void mtk_tx_timeout (struct net_device *dev,int txqueue) {struct mtk_mac *mac =netdev_priv (dev);struct mtk_eth *eth = mac->hw;drivers/net/ethernet/mellanox/mlx4/en_netdev.c +1
-1@@ -1354,7 +1354,7 @@ static void mlx4_en_delete_rss_steer_rules(struct mlx4_en_priv *priv) } } -static void mlx4_en_tx_timeout (struct net_device *dev) +static void mlx4_en_tx_timeout (struct net_device *dev,int txqueue) {struct mlx4_en_priv *priv =netdev_priv (dev);struct mlx4_en_dev *mdev = priv->mdev;drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1
-1@@ -4337,7 +4337,7 @@ static void mlx5e_tx_timeout_work(struct work_struct *work)rtnl_unlock (); } -static void mlx5e_tx_timeout (struct net_device *dev) +static void mlx5e_tx_timeout (struct net_device *dev,int txqueue) {struct mlx5e_priv *priv =netdev_priv (dev);drivers/net/ethernet/micrel/ks8842.c +1
-1@@ -1103,7 +1103,7 @@ static void ks8842_tx_timeout_work(struct work_struct *work)__ks8842_start_new_rx_dma (netdev); } -static void ks8842_tx_timeout (struct net_device *netdev) +static void ks8842_tx_timeout (struct net_device *netdev,int txqueue) {struct ks8842_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/micrel/ksz884x.c +1
-1@@ -4896,7 +4896,7 @@ static netdev_tx_t netdev_tx(struct sk_buff *skb, struct net_device *dev)* triggered to free up resources so that the transmit routine can continue * sending out packets. The hardware is reset to correct the problem. */ -static void netdev_tx_timeout (struct net_device *dev) +static void netdev_tx_timeout (struct net_device *dev,int txqueue) {static unsigned long last_reset;drivers/net/ethernet/microchip/enc28j60.c +1
-1@@ -1325,7 +1325,7 @@ static irqreturn_t enc28j60_irq(int irq, void *dev_id)return IRQ_HANDLED ; } -static void enc28j60_tx_timeout (struct net_device *ndev) +static void enc28j60_tx_timeout (struct net_device *ndev,int txqueue) {struct enc28j60_net *priv =netdev_priv (ndev);drivers/net/ethernet/microchip/encx24j600.c +1
-1@@ -892,7 +892,7 @@ static netdev_tx_t encx24j600_tx(struct sk_buff *skb, struct net_device *dev) }/* Deal with a transmit timeout */ -static void encx24j600_tx_timeout (struct net_device *dev) +static void encx24j600_tx_timeout (struct net_device *dev,int txqueue) {struct encx24j600_priv *priv =netdev_priv (dev);drivers/net/ethernet/natsemi/natsemi.c +2
-2@@ -612,7 +612,7 @@ static void undo_cable_magic(struct net_device *dev);static void check_link (struct net_device *dev);static void netdev_timer (struct timer_list *t);static void dump_ring (struct net_device *dev); -static void ns_tx_timeout (struct net_device *dev); +static void ns_tx_timeout (struct net_device *dev,int txqueue);static int alloc_ring (struct net_device *dev);static void refill_rx (struct net_device *dev);static void init_ring (struct net_device *dev);@@ -1881,7 +1881,7 @@ static void dump_ring(struct net_device *dev) } } -static void ns_tx_timeout (struct net_device *dev) +static void ns_tx_timeout (struct net_device *dev,int txqueue) {struct netdev_private *np =netdev_priv (dev);void __iomem * ioaddr =ns_ioaddr (dev);drivers/net/ethernet/natsemi/ns83820.c +1
-1@@ -1549,7 +1549,7 @@ static int ns83820_stop(struct net_device *ndev)return 0 ; } -static void ns83820_tx_timeout (struct net_device *ndev) +static void ns83820_tx_timeout (struct net_device *ndev,int txqueue) {struct ns83820 *dev =PRIV (ndev);u32 tx_done_idx;drivers/net/ethernet/neterion/s2io.c +1
-1@@ -7238,7 +7238,7 @@ static void s2io_restart_nic(struct work_struct *work)* void */ -static void s2io_tx_watchdog (struct net_device *dev) +static void s2io_tx_watchdog (struct net_device *dev,int txqueue) {struct s2io_nic *sp =netdev_priv (dev);struct swStat *swstats = &sp->mac_control.stats_info->sw_stat;drivers/net/ethernet/neterion/vxge/vxge-main.c +1
-1@@ -3273,7 +3273,7 @@ static int vxge_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)* This function is triggered if the Tx Queue is stopped * for a pre-defined amount of time when the Interface is still up. */ -static void vxge_tx_watchdog (struct net_device *dev) +static void vxge_tx_watchdog (struct net_device *dev,int txqueue) {struct vxgedev *vdev;drivers/net/ethernet/netronome/nfp/nfp_net_common.c +1
-1@@ -1320,7 +1320,7 @@ nfp_net_tx_ring_reset(struct nfp_net_dp *dp, struct nfp_net_tx_ring *tx_ring)netdev_tx_reset_queue (nd_q); } -static void nfp_net_tx_timeout (struct net_device *netdev) +static void nfp_net_tx_timeout (struct net_device *netdev,int txqueue) {struct nfp_net *nn =netdev_priv (netdev);int i;drivers/net/ethernet/nvidia/forcedeth.c +1
-1@@ -2700,7 +2700,7 @@ static int nv_tx_done_optimized(struct net_device *dev, int limit)* nv_tx_timeout: dev->tx_timeout function * Called with netif_tx_lock held. */ -static void nv_tx_timeout (struct net_device *dev) +static void nv_tx_timeout (struct net_device *dev,int txqueue) {struct fe_priv *np =netdev_priv (dev);u8 __iomem *base =get_hwbase (dev);drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +1
-1@@ -2271,7 +2271,7 @@ static int pch_gbe_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)* pch_gbe_tx_timeout - Respond to a Tx Hang * @netdev: Network interface device structure */ -static void pch_gbe_tx_timeout (struct net_device *netdev) +static void pch_gbe_tx_timeout (struct net_device *netdev,int txqueue) {struct pch_gbe_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/packetengines/hamachi.c +2
-2@@ -548,7 +548,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int valstatic int hamachi_open (struct net_device *dev);static int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void hamachi_timer (struct timer_list *t); -static void hamachi_tx_timeout (struct net_device *dev); +static void hamachi_tx_timeout (struct net_device *dev,int txqueue);static void hamachi_init_ring (struct net_device *dev);static netdev_tx_t hamachi_start_xmit (struct sk_buff *skb,struct net_device *dev);@@ -1042,7 +1042,7 @@ static void hamachi_timer(struct timer_list *t)add_timer (&hmp->timer); } -static void hamachi_tx_timeout (struct net_device *dev) +static void hamachi_tx_timeout (struct net_device *dev,int txqueue) {int i;struct hamachi_private *hmp =netdev_priv (dev);drivers/net/ethernet/packetengines/yellowfin.c +2
-2@@ -344,7 +344,7 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int valuestatic int netdev_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static int yellowfin_open (struct net_device *dev);static void yellowfin_timer (struct timer_list *t); -static void yellowfin_tx_timeout (struct net_device *dev); +static void yellowfin_tx_timeout (struct net_device *dev,int txqueue);static int yellowfin_init_ring (struct net_device *dev);static netdev_tx_t yellowfin_start_xmit (struct sk_buff *skb,struct net_device *dev);@@ -677,7 +677,7 @@ static void yellowfin_timer(struct timer_list *t)add_timer (&yp->timer); } -static void yellowfin_tx_timeout (struct net_device *dev) +static void yellowfin_tx_timeout (struct net_device *dev,int txqueue) {struct yellowfin_private *yp =netdev_priv (dev);void __iomem *ioaddr = yp->base;drivers/net/ethernet/pensando/ionic/ionic_lif.c +1
-1@@ -1268,7 +1268,7 @@ static void ionic_tx_timeout_work(struct work_struct *ws)rtnl_unlock (); } -static void ionic_tx_timeout (struct net_device *netdev) +static void ionic_tx_timeout (struct net_device *netdev,int txqueue) {struct ionic_lif *lif =netdev_priv (netdev);drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +2
-2@@ -49,7 +49,7 @@ static int netxen_nic_open(struct net_device *netdev);static int netxen_nic_close (struct net_device *netdev);static netdev_tx_t netxen_nic_xmit_frame (struct sk_buff *,struct net_device *); -static void netxen_tx_timeout (struct net_device *netdev); +static void netxen_tx_timeout (struct net_device *netdev,int txqueue);static void netxen_tx_timeout_task (struct work_struct *work);static void netxen_fw_poll_work (struct work_struct *work); static void netxen_schedule_work(struct netxen_adapter *adapter,@@ -2222,7 +2222,7 @@ static void netxen_nic_handle_phy_intr(struct netxen_adapter *adapter)netxen_advert_link_change (adapter, linkup); } -static void netxen_tx_timeout (struct net_device *netdev) +static void netxen_tx_timeout (struct net_device *netdev,int txqueue) {struct netxen_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/qlogic/qla3xxx.c +1
-1@@ -3602,7 +3602,7 @@ static int ql3xxx_set_mac_address(struct net_device *ndev, void *p)return 0 ; } -static void ql3xxx_tx_timeout (struct net_device *ndev) +static void ql3xxx_tx_timeout (struct net_device *ndev,int txqueue) {struct ql3_adapter *qdev =netdev_priv (ndev);drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +2
-2@@ -56,7 +56,7 @@ static int qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent);static void qlcnic_remove (struct pci_dev *pdev);static int qlcnic_open (struct net_device *netdev);static int qlcnic_close (struct net_device *netdev); -static void qlcnic_tx_timeout (struct net_device *netdev); +static void qlcnic_tx_timeout (struct net_device *netdev,int txqueue);static void qlcnic_attach_work (struct work_struct *work);static void qlcnic_fwinit_work (struct work_struct *work);@@ -3068,7 +3068,7 @@ static void qlcnic_dump_rings(struct qlcnic_adapter *adapter) } -static void qlcnic_tx_timeout (struct net_device *netdev) +static void qlcnic_tx_timeout (struct net_device *netdev,int txqueue) {struct qlcnic_adapter *adapter =netdev_priv (netdev);drivers/net/ethernet/qualcomm/emac/emac.c +1
-1@@ -282,7 +282,7 @@ static int emac_close(struct net_device *netdev) }/* Respond to a TX hang */ -static void emac_tx_timeout (struct net_device *netdev) +static void emac_tx_timeout (struct net_device *netdev,int txqueue) {struct emac_adapter *adpt =netdev_priv (netdev);drivers/net/ethernet/qualcomm/qca_spi.c +1
-1@@ -786,7 +786,7 @@ qcaspi_netdev_xmit(struct sk_buff *skb, struct net_device *dev) }static void -qcaspi_netdev_tx_timeout (struct net_device *dev) +qcaspi_netdev_tx_timeout (struct net_device *dev,int txqueue) {struct qcaspi *qca =netdev_priv (dev);drivers/net/ethernet/qualcomm/qca_uart.c +1
-1@@ -248,7 +248,7 @@ qcauart_netdev_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void qcauart_netdev_tx_timeout (struct net_device *dev) +static void qcauart_netdev_tx_timeout (struct net_device *dev,int txqueue) {struct qcauart *qca =netdev_priv (dev);drivers/net/ethernet/rdc/r6040.c +1
-1@@ -410,7 +410,7 @@ static void r6040_init_mac_regs(struct net_device *dev)iowrite16 (TM2TX , ioaddr +MTPR ); } -static void r6040_tx_timeout (struct net_device *dev) +static void r6040_tx_timeout (struct net_device *dev,int txqueue) {struct r6040_private *priv =netdev_priv (dev);void __iomem *ioaddr = priv->base;drivers/net/ethernet/realtek/8139cp.c +1
-1@@ -1235,7 +1235,7 @@ static int cp_close (struct net_device *dev)return 0 ; } -static void cp_tx_timeout (struct net_device *dev) +static void cp_tx_timeout (struct net_device *dev,int txqueue) {struct cp_private *cp =netdev_priv (dev);unsigned long flags;drivers/net/ethernet/realtek/atp.c +2
-2@@ -204,7 +204,7 @@ static void net_rx(struct net_device *dev);static void read_block (long ioaddr,int length,unsigned char *buffer,int data_mode);static int net_close (struct net_device *dev);static void set_rx_mode (struct net_device *dev); -static void tx_timeout (struct net_device *dev); +static void tx_timeout (struct net_device *dev,int txqueue);/* A list of all installed ATP devices, for removing the driver module. */ @@ -533,7 +533,7 @@ static void write_packet(long ioaddr, int length, unsigned char *packet, int padoutb (Ctrl_HNibWrite | Ctrl_SelData | Ctrl_IRQEN, ioaddr +PAR_CONTROL ); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {long ioaddr = dev->base_addr;drivers/net/ethernet/realtek/r8169_main.c +1
-1@@ -5662,7 +5662,7 @@ static void rtl_reset_work(struct rtl8169_private *tp)netif_wake_queue (dev); } -static void rtl8169_tx_timeout (struct net_device *dev) +static void rtl8169_tx_timeout (struct net_device *dev,int txqueue) {struct rtl8169_private *tp =netdev_priv (dev);drivers/net/ethernet/renesas/ravb_main.c +1
-1@@ -1425,7 +1425,7 @@ static int ravb_open(struct net_device *ndev) }/* Timeout function for Ethernet AVB */ -static void ravb_tx_timeout (struct net_device *ndev) +static void ravb_tx_timeout (struct net_device *ndev,int txqueue) {struct ravb_private *priv =netdev_priv (ndev);drivers/net/ethernet/renesas/sh_eth.c +1
-1@@ -2478,7 +2478,7 @@ static int sh_eth_open(struct net_device *ndev) }/* Timeout function */ -static void sh_eth_tx_timeout (struct net_device *ndev) +static void sh_eth_tx_timeout (struct net_device *ndev,int txqueue) {struct sh_eth_private *mdp =netdev_priv (ndev);struct sh_eth_rxdesc *rxdesc;drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +1
-1@@ -1572,7 +1572,7 @@ static int sxgbe_poll(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void sxgbe_tx_timeout (struct net_device *dev) +static void sxgbe_tx_timeout (struct net_device *dev,int txqueue) {struct sxgbe_priv_data *priv =netdev_priv (dev);drivers/net/ethernet/seeq/ether3.c +2
-2@@ -79,7 +79,7 @@ static netdev_tx_t ether3_sendpacket(struct sk_buff *skb,static irqreturn_t ether3_interrupt (int irq,void *dev_id);static int ether3_close (struct net_device *dev);static void ether3_setmulticastlist (struct net_device *dev); -static void ether3_timeout (struct net_device *dev); +static void ether3_timeout (struct net_device *dev,int txqueue);#define BUS_16 2#define BUS_8 1@@ -450,7 +450,7 @@ static void ether3_setmulticastlist(struct net_device *dev)ether3_outw (priv (dev)->regs.config1 |CFG1_LOCBUFMEM ,REG_CONFIG1 ); } -static void ether3_timeout (struct net_device *dev) +static void ether3_timeout (struct net_device *dev,int txqueue) {unsigned long flags;drivers/net/ethernet/seeq/sgiseeq.c +1
-1@@ -645,7 +645,7 @@ sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void timeout (struct net_device *dev) +static void timeout (struct net_device *dev,int txqueue) {printk (KERN_NOTICE "%s: transmit timed out, resetting\n" , dev->name);sgiseeq_reset (dev);drivers/net/ethernet/sgi/ioc3-eth.c +2
-2@@ -113,7 +113,7 @@ struct ioc3_private {static int ioc3_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static void ioc3_set_multicast_list (struct net_device *dev);static netdev_tx_t ioc3_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void ioc3_timeout (struct net_device *dev); +static void ioc3_timeout (struct net_device *dev,int txqueue);static inline unsigned int ioc3_hash (const unsigned char *addr);static void ioc3_start (struct ioc3_private *ip);static inline void ioc3_stop (struct ioc3_private *ip);@@ -1493,7 +1493,7 @@ static netdev_tx_t ioc3_start_xmit(struct sk_buff *skb, struct net_device *dev)return NETDEV_TX_OK ; } -static void ioc3_timeout (struct net_device *dev) +static void ioc3_timeout (struct net_device *dev,int txqueue) {struct ioc3_private *ip =netdev_priv (dev);drivers/net/ethernet/sgi/meth.c +2
-2@@ -90,7 +90,7 @@ struct meth_private {spinlock_t meth_lock; }; -static void meth_tx_timeout (struct net_device *dev); +static void meth_tx_timeout (struct net_device *dev,int txqueue);static irqreturn_t meth_interrupt (int irq,void *dev_id);/* global, initialized in ip32-setup.c */ @@ -727,7 +727,7 @@ static netdev_tx_t meth_tx(struct sk_buff *skb, struct net_device *dev)/* * Deal with a transmit timeout. */ -static void meth_tx_timeout (struct net_device *dev) +static void meth_tx_timeout (struct net_device *dev,int txqueue) {struct meth_private *priv =netdev_priv (dev);unsigned long flags;drivers/net/ethernet/silan/sc92031.c +1
-1@@ -1078,7 +1078,7 @@ static void sc92031_set_multicast_list(struct net_device *dev)spin_unlock_bh (&priv->lock); } -static void sc92031_tx_timeout (struct net_device *dev) +static void sc92031_tx_timeout (struct net_device *dev,int txqueue) {struct sc92031_priv *priv =netdev_priv (dev);drivers/net/ethernet/sis/sis190.c +1
-1@@ -1538,7 +1538,7 @@ static struct net_device *sis190_init_board(struct pci_dev *pdev) goto out; } -static void sis190_tx_timeout (struct net_device *dev) +static void sis190_tx_timeout (struct net_device *dev,int txqueue) {struct sis190_private *tp =netdev_priv (dev);void __iomem *ioaddr = tp->mmio_addr;drivers/net/ethernet/smsc/epic100.c +2
-2@@ -291,7 +291,7 @@ static int mdio_read(struct net_device *dev, int phy_id, int location);static void mdio_write (struct net_device *dev,int phy_id,int loc,int val);static void epic_restart (struct net_device *dev);static void epic_timer (struct timer_list *t); -static void epic_tx_timeout (struct net_device *dev); +static void epic_tx_timeout (struct net_device *dev,int txqueue);static void epic_init_ring (struct net_device *dev);static netdev_tx_t epic_start_xmit (struct sk_buff *skb,struct net_device *dev);@@ -861,7 +861,7 @@ static void epic_timer(struct timer_list *t)add_timer (&ep->timer); } -static void epic_tx_timeout (struct net_device *dev) +static void epic_tx_timeout (struct net_device *dev,int txqueue) {struct epic_private *ep =netdev_priv (dev);void __iomem *ioaddr = ep->ioaddr;drivers/net/ethernet/smsc/smc911x.c +1
-1@@ -1245,7 +1245,7 @@ static void smc911x_poll_controller(struct net_device *dev)#endif /* Our watchdog timed out. Called by the networking layer */ -static void smc911x_timeout (struct net_device *dev) +static void smc911x_timeout (struct net_device *dev,int txqueue) {struct smc911x_local *lp =netdev_priv (dev);int status, mask;drivers/net/ethernet/smsc/smc9194.c +2
-2@@ -216,7 +216,7 @@ static int smc_open(struct net_device *dev);/* . Our watchdog timed out. Called by the networking layer */ -static void smc_timeout (struct net_device *dev); +static void smc_timeout (struct net_device *dev,int txqueue);/* . This is called by the kernel in response to 'ifconfig ethX down'. It @@ -1094,7 +1094,7 @@ static int smc_open(struct net_device *dev).-------------------------------------------------------- */ -static void smc_timeout (struct net_device *dev) +static void smc_timeout (struct net_device *dev,int txqueue) {/* If we get here, some higher level has decided we are broken. There should really be a "kick me" function call instead. */ drivers/net/ethernet/smsc/smc91c92_cs.c +2
-2@@ -271,7 +271,7 @@ static void smc91c92_release(struct pcmcia_device *link);static int smc_open (struct net_device *dev);static int smc_close (struct net_device *dev);static int smc_ioctl (struct net_device *dev,struct ifreq *rq,int cmd); -static void smc_tx_timeout (struct net_device *dev); +static void smc_tx_timeout (struct net_device *dev,int txqueue);static netdev_tx_t smc_start_xmit (struct sk_buff *skb,struct net_device *dev);static irqreturn_t smc_interrupt (int irq,void *dev_id);@@ -1178,7 +1178,7 @@ static void smc_hardware_send_packet(struct net_device * dev)/*====================================================================*/ -static void smc_tx_timeout (struct net_device *dev) +static void smc_tx_timeout (struct net_device *dev,int txqueue) {struct smc_private *smc =netdev_priv (dev);unsigned int ioaddr = dev->base_addr;drivers/net/ethernet/smsc/smc91x.c +1
-1@@ -1321,7 +1321,7 @@ static void smc_poll_controller(struct net_device *dev)#endif /* Our watchdog timed out. Called by the networking layer */ -static void smc_timeout (struct net_device *dev) +static void smc_timeout (struct net_device *dev,int txqueue) {struct smc_local *lp =netdev_priv (dev);void __iomem *ioaddr = lp->base;drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +1
-1@@ -3712,7 +3712,7 @@ static int stmmac_napi_poll_tx(struct napi_struct *napi, int budget)* netdev structure and arrange for the device to be reset to a sane state * in order to transmit a new packet. */ -static void stmmac_tx_timeout (struct net_device *dev) +static void stmmac_tx_timeout (struct net_device *dev,int txqueue) {struct stmmac_priv *priv =netdev_priv (dev);drivers/net/ethernet/sun/cassini.c +1
-1@@ -2666,7 +2666,7 @@ static void cas_netpoll(struct net_device *dev) }#endif -static void cas_tx_timeout (struct net_device *dev) +static void cas_tx_timeout (struct net_device *dev,int txqueue) {struct cas *cp =netdev_priv (dev);drivers/net/ethernet/sun/niu.c +1
-1@@ -6517,7 +6517,7 @@ static void niu_reset_task(struct work_struct *work)spin_unlock_irqrestore (&np->lock, flags); } -static void niu_tx_timeout (struct net_device *dev) +static void niu_tx_timeout (struct net_device *dev,int txqueue) {struct niu *np =netdev_priv (dev);drivers/net/ethernet/sun/sunbmac.c +1
-1@@ -941,7 +941,7 @@ static int bigmac_close(struct net_device *dev)return 0 ; } -static void bigmac_tx_timeout (struct net_device *dev) +static void bigmac_tx_timeout (struct net_device *dev,int txqueue) {struct bigmac *bp =netdev_priv (dev);drivers/net/ethernet/sun/sungem.c +1
-1@@ -970,7 +970,7 @@ static void gem_poll_controller(struct net_device *dev) }#endif -static void gem_tx_timeout (struct net_device *dev) +static void gem_tx_timeout (struct net_device *dev,int txqueue) {struct gem *gp =netdev_priv (dev);drivers/net/ethernet/sun/sunhme.c +1
-1@@ -2246,7 +2246,7 @@ static int happy_meal_close(struct net_device *dev)#define SXD (x)#endif -static void happy_meal_tx_timeout (struct net_device *dev) +static void happy_meal_tx_timeout (struct net_device *dev,int txqueue) {struct happy_meal *hp =netdev_priv (dev);drivers/net/ethernet/sun/sunqe.c +1
-1@@ -544,7 +544,7 @@ static void qe_tx_reclaim(struct sunqe *qep) qep->tx_old = elem; } -static void qe_tx_timeout (struct net_device *dev) +static void qe_tx_timeout (struct net_device *dev,int txqueue) {struct sunqe *qep =netdev_priv (dev);int tx_full;drivers/net/ethernet/synopsys/dwc-xlgmac-net.c +1
-1@@ -689,7 +689,7 @@ static int xlgmac_close(struct net_device *netdev)return 0 ; } -static void xlgmac_tx_timeout (struct net_device *netdev) +static void xlgmac_tx_timeout (struct net_device *netdev,int txqueue) {struct xlgmac_pdata *pdata =netdev_priv (netdev);drivers/net/ethernet/ti/cpmac.c +1
-1@@ -797,7 +797,7 @@ static irqreturn_t cpmac_irq(int irq, void *dev_id)return IRQ_HANDLED ; } -static void cpmac_tx_timeout (struct net_device *dev) +static void cpmac_tx_timeout (struct net_device *dev,int txqueue) {struct cpmac_priv *priv =netdev_priv (dev);drivers/net/ethernet/ti/cpsw.c +1
-1@@ -2035,7 +2035,7 @@ static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd)return phy_mii_ioctl (cpsw->slaves[slave_no].phy, req, cmd); } -static void cpsw_ndo_tx_timeout (struct net_device *ndev) +static void cpsw_ndo_tx_timeout (struct net_device *ndev,int txqueue) {struct cpsw_priv *priv =netdev_priv (ndev);struct cpsw_common *cpsw = priv->cpsw;drivers/net/ethernet/ti/davinci_emac.c +1
-1@@ -983,7 +983,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev)* error and re-initialize the TX channel for hardware operation * */ -static void emac_dev_tx_timeout (struct net_device *ndev) +static void emac_dev_tx_timeout (struct net_device *ndev,int txqueue) {struct emac_priv *priv =netdev_priv (ndev);struct device *emac_dev = &ndev->dev;drivers/net/ethernet/ti/netcp_core.c +1
-1@@ -1811,7 +1811,7 @@ static int netcp_ndo_ioctl(struct net_device *ndev,return (ret ==0 ) ?0 : err; } -static void netcp_ndo_tx_timeout (struct net_device *ndev) +static void netcp_ndo_tx_timeout (struct net_device *ndev,int txqueue) {struct netcp_intf *netcp =netdev_priv (ndev);unsigned int descs =knav_pool_count (netcp->tx_pool);drivers/net/ethernet/ti/tlan.c +2
-2@@ -161,7 +161,7 @@ static void tlan_set_multicast_list(struct net_device *);static int tlan_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);static int tlan_probe1 (struct pci_dev *pdev,long ioaddr,int irq,int rev,const struct pci_device_id *ent); -static void tlan_tx_timeout (struct net_device *dev); +static void tlan_tx_timeout (struct net_device *dev,int txqueue);static void tlan_tx_timeout_work (struct work_struct *work);static int tlan_init_one (struct pci_dev *pdev,const struct pci_device_id *ent);@@ -997,7 +997,7 @@ static int tlan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)* **************************************************************/ -static void tlan_tx_timeout (struct net_device *dev) +static void tlan_tx_timeout (struct net_device *dev,int txqueue) {TLAN_DBG (TLAN_DEBUG_GNRL ,"%s: Transmit timed out.\n" , dev->name);drivers/net/ethernet/toshiba/ps3_gelic_net.c +1
-1@@ -1405,7 +1405,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work)* * called, if tx hangs. Schedules a task that resets the interface */ -void gelic_net_tx_timeout (struct net_device *netdev) +void gelic_net_tx_timeout (struct net_device *netdev,int txqueue) {struct gelic_card *card;drivers/net/ethernet/toshiba/spider_net.c +1
-1@@ -2180,7 +2180,7 @@ spider_net_tx_timeout_task(struct work_struct *work)* called, if tx hangs. Schedules a task that resets the interface */ static void -spider_net_tx_timeout (struct net_device *netdev) +spider_net_tx_timeout (struct net_device *netdev,int txqueue) {struct spider_net_card *card;drivers/net/ethernet/toshiba/tc35815.c +2
-2@@ -483,7 +483,7 @@ static void tc35815_txdone(struct net_device *dev);static int tc35815_close (struct net_device *dev);static struct net_device_stats *tc35815_get_stats (struct net_device *dev);static void tc35815_set_multicast_list (struct net_device *dev); -static void tc35815_tx_timeout (struct net_device *dev); +static void tc35815_tx_timeout (struct net_device *dev,int txqueue);static int tc35815_ioctl (struct net_device *dev,struct ifreq *rq,int cmd);#ifdef CONFIG_NET_POLL_CONTROLLER static void tc35815_poll_controller (struct net_device *dev);@@ -1189,7 +1189,7 @@ static void tc35815_schedule_restart(struct net_device *dev)spin_unlock_irqrestore (&lp->lock, flags); } -static void tc35815_tx_timeout (struct net_device *dev) +static void tc35815_tx_timeout (struct net_device *dev,int txqueue) {struct tc35815_regs __iomem *tr = (struct tc35815_regs __iomem *)dev->base_addr;drivers/net/ethernet/via/via-rhine.c +2
-2@@ -506,7 +506,7 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int valstatic int rhine_open (struct net_device *dev);static void rhine_reset_task (struct work_struct *work);static void rhine_slow_event_task (struct work_struct *work); -static void rhine_tx_timeout (struct net_device *dev); +static void rhine_tx_timeout (struct net_device *dev,int txqueue);static netdev_tx_t rhine_start_tx (struct sk_buff *skb,struct net_device *dev);static irqreturn_t rhine_interrupt (int irq,void *dev_instance);@@ -1761,7 +1761,7 @@ static void rhine_reset_task(struct work_struct *work)mutex_unlock (&rp->task_lock); } -static void rhine_tx_timeout (struct net_device *dev) +static void rhine_tx_timeout (struct net_device *dev,int txqueue) {struct rhine_private *rp =netdev_priv (dev);void __iomem *ioaddr = rp->base;drivers/net/ethernet/wiznet/w5100.c +1
-1@@ -790,7 +790,7 @@ static void w5100_restart_work(struct work_struct *work)w5100_restart (priv->ndev); } -static void w5100_tx_timeout (struct net_device *ndev) +static void w5100_tx_timeout (struct net_device *ndev,int txqueue) {struct w5100_priv *priv =netdev_priv (ndev);drivers/net/ethernet/wiznet/w5300.c +1
-1@@ -341,7 +341,7 @@ static void w5300_get_regs(struct net_device *ndev, } } -static void w5300_tx_timeout (struct net_device *ndev) +static void w5300_tx_timeout (struct net_device *ndev,int txqueue) {struct w5300_priv *priv =netdev_priv (ndev);drivers/net/ethernet/xilinx/xilinx_emaclite.c +1
-1@@ -521,7 +521,7 @@ static int xemaclite_set_mac_address(struct net_device *dev, void *address)* * This function is called when Tx time out occurs for Emaclite device. */ -static void xemaclite_tx_timeout (struct net_device *dev) +static void xemaclite_tx_timeout (struct net_device *dev,int txqueue) {struct net_local *lp =netdev_priv (dev);unsigned long flags;drivers/net/ethernet/xircom/xirc2ps_cs.c +2
-2@@ -288,7 +288,7 @@ struct local_info {*/ static netdev_tx_t do_start_xmit (struct sk_buff *skb,struct net_device *dev); -static void xirc_tx_timeout (struct net_device *dev); +static void xirc_tx_timeout (struct net_device *dev,int txqueue);static void xirc2ps_tx_timeout_task (struct work_struct *work);static void set_addresses (struct net_device *dev);static void set_multicast_list (struct net_device *dev);@@ -1203,7 +1203,7 @@ xirc2ps_tx_timeout_task(struct work_struct *work) }static void -xirc_tx_timeout (struct net_device *dev) +xirc_tx_timeout (struct net_device *dev,int txqueue) {struct local_info *lp =netdev_priv (dev); dev->stats.tx_errors++;drivers/net/fjes/fjes_main.c +1
-1@@ -792,7 +792,7 @@ fjes_xmit_frame(struct sk_buff *skb, struct net_device *netdev)return ret; } -static void fjes_tx_retry (struct net_device *netdev) +static void fjes_tx_retry (struct net_device *netdev,int txqueue) {struct netdev_queue *queue =netdev_get_tx_queue (netdev,0 );drivers/net/slip/slip.c +1
-1@@ -457,7 +457,7 @@ static void slip_write_wakeup(struct tty_struct *tty)schedule_work (&sl->tx_work); } -static void sl_tx_timeout (struct net_device *dev) +static void sl_tx_timeout (struct net_device *dev,int txqueue) {struct slip *sl =netdev_priv (dev);drivers/net/usb/catc.c +1
-1@@ -447,7 +447,7 @@ static netdev_tx_t catc_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void catc_tx_timeout (struct net_device *netdev) +static void catc_tx_timeout (struct net_device *netdev,int txqueue) {struct catc *catc =netdev_priv (netdev);drivers/net/usb/hso.c +1
-1@@ -820,7 +820,7 @@ static const struct ethtool_ops ops = { };/* called when a packet did not ack after watchdogtimeout */ -static void hso_net_tx_timeout (struct net_device *net) +static void hso_net_tx_timeout (struct net_device *net,int txqueue) {struct hso_net *odev =netdev_priv (net);drivers/net/usb/ipheth.c +1
-1@@ -400,7 +400,7 @@ static int ipheth_tx(struct sk_buff *skb, struct net_device *net)return NETDEV_TX_OK ; } -static void ipheth_tx_timeout (struct net_device *net) +static void ipheth_tx_timeout (struct net_device *net,int txqueue) {struct ipheth_device *dev =netdev_priv (net);drivers/net/usb/kaweth.c +1
-1@@ -894,7 +894,7 @@ static void kaweth_async_set_rx_mode(struct kaweth_device *kaweth)/**************************************************************** * kaweth_tx_timeout ****************************************************************/ -static void kaweth_tx_timeout (struct net_device *net) +static void kaweth_tx_timeout (struct net_device *net,int txqueue) {struct kaweth_device *kaweth =netdev_priv (net);drivers/net/usb/lan78xx.c +1
-1@@ -3662,7 +3662,7 @@ static void lan78xx_disconnect(struct usb_interface *intf)usb_put_dev (udev); } -static void lan78xx_tx_timeout (struct net_device *net) +static void lan78xx_tx_timeout (struct net_device *net,int txqueue) {struct lan78xx_net *dev =netdev_priv (net);drivers/net/usb/pegasus.c +1
-1@@ -693,7 +693,7 @@ static void intr_callback(struct urb *urb) "can't resubmit interrupt urb, %d\n", res); } -static void pegasus_tx_timeout (struct net_device *net) +static void pegasus_tx_timeout (struct net_device *net,int txqueue) {pegasus_t *pegasus =netdev_priv (net);netif_warn (pegasus, timer, net,"tx timeout\n" );drivers/net/usb/r8152.c +1
-1@@ -2306,7 +2306,7 @@ static void rtl_drop_queued_tx(struct r8152 *tp) } } -static void rtl8152_tx_timeout (struct net_device *netdev) +static void rtl8152_tx_timeout (struct net_device *netdev,int txqueue) {struct r8152 *tp =netdev_priv (netdev);drivers/net/usb/rtl8150.c +1
-1@@ -655,7 +655,7 @@ static void disable_net_traffic(rtl8150_t * dev)set_registers (dev,CR ,1 , &cr); } -static void rtl8150_tx_timeout (struct net_device *netdev) +static void rtl8150_tx_timeout (struct net_device *netdev,int txqueue) {rtl8150_t *dev =netdev_priv (netdev);dev_warn (&netdev->dev,"Tx timeout.\n" );drivers/net/vmxnet3/vmxnet3_drv.c +1
-1@@ -3198,7 +3198,7 @@ vmxnet3_free_intr_resources(struct vmxnet3_adapter *adapter)static void -vmxnet3_tx_timeout (struct net_device *netdev) +vmxnet3_tx_timeout (struct net_device *netdev,int txqueue) {struct vmxnet3_adapter *adapter =netdev_priv (netdev); adapter->tx_timeout_count++;drivers/net/wan/cosa.c +2
-2@@ -268,7 +268,7 @@ static int cosa_net_attach(struct net_device *dev, unsigned short encoding, unsigned short parity);static int cosa_net_open (struct net_device *d);static int cosa_net_close (struct net_device *d); -static void cosa_net_timeout (struct net_device *d); +static void cosa_net_timeout (struct net_device *d,int txqueue);static netdev_tx_t cosa_net_tx (struct sk_buff *skb,struct net_device *d);static char *cosa_net_setup_rx (struct channel_data *channel,int size);static int cosa_net_rx_done (struct channel_data *channel);@@ -670,7 +670,7 @@ static netdev_tx_t cosa_net_tx(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void cosa_net_timeout (struct net_device *dev) +static void cosa_net_timeout (struct net_device *dev,int txqueue) {struct channel_data *chan =dev_to_chan (dev);drivers/net/wan/farsync.c +1
-1@@ -2239,7 +2239,7 @@ fst_attach(struct net_device *dev, unsigned short encoding, unsigned short parit }static void -fst_tx_timeout (struct net_device *dev) +fst_tx_timeout (struct net_device *dev,int txqueue) {struct fst_port_info *port;struct fst_card_info *card;drivers/net/wan/fsl_ucc_hdlc.c +1
-1@@ -1039,7 +1039,7 @@ static const struct dev_pm_ops uhdlc_pm_ops = {#define HDLC_PM_OPS NULL#endif -static void uhdlc_tx_timeout (struct net_device *ndev) +static void uhdlc_tx_timeout (struct net_device *ndev,int txqueue) {netdev_err (ndev,"%s\n" , __func__); }drivers/net/wan/lmc/lmc_main.c +2
-2@@ -99,7 +99,7 @@ static int lmc_ifdown(struct net_device * const);static void lmc_watchdog (struct timer_list *t);static void lmc_reset (lmc_softc_t *const sc);static void lmc_dec_reset (lmc_softc_t *const sc); -static void lmc_driver_timeout (struct net_device *dev); +static void lmc_driver_timeout (struct net_device *dev,int txqueue);/* * linux reserves 16 device specific IOCTLs. We call them @@ -2044,7 +2044,7 @@ static void lmc_initcsrs(lmc_softc_t * const sc, lmc_csrptr_t csr_base, /*fold00lmc_trace (sc->lmc_device,"lmc_initcsrs out" ); } -static void lmc_driver_timeout (struct net_device *dev) +static void lmc_driver_timeout (struct net_device *dev,int txqueue) {lmc_softc_t *sc =dev_to_sc (dev);u32 csr6;drivers/net/wan/x25_asy.c +1
-1@@ -276,7 +276,7 @@ static void x25_asy_write_wakeup(struct tty_struct *tty) sl->xhead += actual; } -static void x25_asy_timeout (struct net_device *dev) +static void x25_asy_timeout (struct net_device *dev,int txqueue) {struct x25_asy *sl =netdev_priv (dev);drivers/net/wireless/intel/ipw2x00/ipw2100.c +1
-1@@ -5834,7 +5834,7 @@ static int ipw2100_close(struct net_device *dev)/* * TODO: Fix this function... its just wrong */ -static void ipw2100_tx_timeout (struct net_device *dev) +static void ipw2100_tx_timeout (struct net_device *dev,int txqueue) {struct ipw2100_priv *priv =libipw_priv (dev);drivers/net/wireless/intersil/hostap/hostap_main.c +1
-1@@ -761,7 +761,7 @@ static void hostap_set_multicast_list(struct net_device *dev) } -static void prism2_tx_timeout (struct net_device *dev) +static void prism2_tx_timeout (struct net_device *dev,int txqueue) {struct hostap_interface *iface;local_info_t *local;drivers/net/wireless/intersil/orinoco/main.c +1
-1@@ -647,7 +647,7 @@ static void __orinoco_ev_txexc(struct net_device *dev, struct hermes *hw)netif_wake_queue (dev); } -void orinoco_tx_timeout (struct net_device *dev) +void orinoco_tx_timeout (struct net_device *dev,int txqueue) {struct orinoco_private *priv =ndev_priv (dev);struct net_device_stats *stats = &dev->stats;drivers/net/wireless/marvell/mwifiex/main.c +1
-1@@ -1019,7 +1019,7 @@ static void mwifiex_set_multicast_list(struct net_device *dev)* CFG802.11 network device handler for transmission timeout. */ static void -mwifiex_tx_timeout (struct net_device *dev) +mwifiex_tx_timeout (struct net_device *dev,int txqueue) {struct mwifiex_private *priv =mwifiex_netdev_get_priv (dev);drivers/net/wireless/quantenna/qtnfmac/core.c +1
-1@@ -148,7 +148,7 @@ static void qtnf_netdev_get_stats64(struct net_device *ndev,/* Netdev handler for transmission timeout. */ -static void qtnf_netdev_tx_timeout (struct net_device *ndev) +static void qtnf_netdev_tx_timeout (struct net_device *ndev,int txqueue) {struct qtnf_vif *vif =qtnf_netdev_get_priv (ndev);struct qtnf_wmac *mac;drivers/net/wireless/wl3501_cs.c +1
-1@@ -1285,7 +1285,7 @@ static int wl3501_reset(struct net_device *dev)return rc; } -static void wl3501_tx_timeout (struct net_device *dev) +static void wl3501_tx_timeout (struct net_device *dev,int txqueue) {struct net_device_stats *stats = &dev->stats;int rc;drivers/net/wireless/zydas/zd1201.c +1
-1@@ -830,7 +830,7 @@ static netdev_tx_t zd1201_hard_start_xmit(struct sk_buff *skb,return NETDEV_TX_OK ; } -static void zd1201_tx_timeout (struct net_device *dev) +static void zd1201_tx_timeout (struct net_device *dev,int txqueue) {struct zd1201 *zd =netdev_priv (dev);drivers/staging/ks7010/ks_wlan_net.c +2
-2@@ -45,7 +45,7 @@ struct wep_key {* function prototypes */ static int ks_wlan_open (struct net_device *dev); -static void ks_wlan_tx_timeout (struct net_device *dev); +static void ks_wlan_tx_timeout (struct net_device *dev,int txqueue);static int ks_wlan_start_xmit (struct sk_buff *skb,struct net_device *dev);static int ks_wlan_close (struct net_device *dev);static void ks_wlan_set_rx_mode (struct net_device *dev);@@ -2498,7 +2498,7 @@ int ks_wlan_set_mac_address(struct net_device *dev, void *addr) }static -void ks_wlan_tx_timeout (struct net_device *dev) +void ks_wlan_tx_timeout (struct net_device *dev,int txqueue) {struct ks_wlan_private *priv =netdev_priv (dev);drivers/staging/qlge/qlge_main.c +1
-1@@ -4436,7 +4436,7 @@ static int qlge_set_mac_address(struct net_device *ndev, void *p)return status; } -static void qlge_tx_timeout (struct net_device *ndev) +static void qlge_tx_timeout (struct net_device *ndev,int txqueue) {struct ql_adapter *qdev =netdev_priv (ndev);ql_queue_asic_error (qdev);drivers/staging/rtl8192e/rtl8192e/rtl_core.c +1
-1@@ -267,7 +267,7 @@ static short _rtl92e_check_nic_enough_desc(struct net_device *dev, int prio)return 0 ; } -static void _rtl92e_tx_timeout (struct net_device *dev) +static void _rtl92e_tx_timeout (struct net_device *dev,int txqueue) {struct r8192_priv *priv =rtllib_priv (dev);drivers/staging/rtl8192u/r8192U_core.c +1
-1@@ -654,7 +654,7 @@ short check_nic_enough_desc(struct net_device *dev, int queue_index)return (used <MAX_TX_URB ); } -static void tx_timeout (struct net_device *dev) +static void tx_timeout (struct net_device *dev,int txqueue) {struct r8192_priv *priv =ieee80211_priv (dev);drivers/staging/unisys/visornic/visornic_main.c +1
-1@@ -1078,7 +1078,7 @@ static void visornic_set_multi(struct net_device *netdev)* Queue the work and return. Make sure we have not already been informed that * the IO Partition is gone; if so, we will have already timed-out the xmits. */ -static void visornic_xmit_timeout (struct net_device *netdev) +static void visornic_xmit_timeout (struct net_device *netdev,int txqueue) {struct visornic_devdata *devdata =netdev_priv (netdev);unsigned long flags;drivers/staging/wlan-ng/p80211netdev.c +2
-2@@ -101,7 +101,7 @@ static void p80211knetdev_set_multicast_list(struct net_device *dev);static int p80211knetdev_do_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd);static int p80211knetdev_set_mac_address (struct net_device *dev,void *addr); -static void p80211knetdev_tx_timeout (struct net_device *netdev); +static void p80211knetdev_tx_timeout (struct net_device *netdev,int txqueue);static int p80211_rx_typedrop (struct wlandevice *wlandev,u16 fc);int wlan_watchdog =5000 ;@@ -1074,7 +1074,7 @@ static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc)return drop; } -static void p80211knetdev_tx_timeout (struct net_device *netdev) +static void p80211knetdev_tx_timeout (struct net_device *netdev,int txqueue) {struct wlandevice *wlandev = netdev->ml_priv;drivers/tty/n_gsm.c +1
-1@@ -2704,7 +2704,7 @@ static netdev_tx_t gsm_mux_net_start_xmit(struct sk_buff *skb, }/* called when a packet did not ack after watchdogtimeout */ -static void gsm_mux_net_tx_timeout (struct net_device *net) +static void gsm_mux_net_tx_timeout (struct net_device *net,int txqueue) {/* Tell syslog we are hosed. */ dev_dbg (&net->dev,"Tx timed out.\n" );drivers/tty/synclink.c +1
-1@@ -7837,7 +7837,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {struct mgsl_struct *info =dev_to_port (dev);unsigned long flags;drivers/tty/synclink_gt.c +1
-1@@ -1682,7 +1682,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {struct slgt_info *info =dev_to_port (dev);unsigned long flags;drivers/tty/synclinkmp.c +1
-1@@ -1807,7 +1807,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)* * dev pointer to network device structure */ -static void hdlcdev_tx_timeout (struct net_device *dev) +static void hdlcdev_tx_timeout (struct net_device *dev,int txqueue) {SLMP_INFO *info =dev_to_port (dev);unsigned long flags;include/linux/netdevice.h +3
-2@@ -1004,7 +1004,7 @@ struct tlsdev_ops;* Called when a user wants to change the Maximum Transfer Unit * of a device. * -* void (*ndo_tx_timeout)(struct net_device *dev); +* void (*ndo_tx_timeout)(struct net_device *dev, int txqueue); * Callback used when the transmitter has not made any progress * for dev->watchdog ticks. * @@ -1271,7 +1271,8 @@ struct net_device_ops { int new_mtu);int (*ndo_neigh_setup)(struct net_device *dev,struct neigh_parms *); -void (*ndo_tx_timeout) (struct net_device *dev); +void (*ndo_tx_timeout) (struct net_device *dev, +int txqueue);void (*ndo_get_stats64)(struct net_device *dev,struct rtnl_link_stats64 *storage);net/atm/lec.c +1
-1@@ -194,7 +194,7 @@ lec_send(struct atm_vcc *vcc, struct sk_buff *skb) dev->stats.tx_bytes += skb->len; } -static void lec_tx_timeout (struct net_device *dev) +static void lec_tx_timeout (struct net_device *dev,int txqueue) {pr_info ("%s\n" , dev->name);netif_trans_update (dev);net/bluetooth/bnep/netdev.c +1
-1@@ -112,7 +112,7 @@ static int bnep_net_set_mac_addr(struct net_device *dev, void *arg)return 0 ; } -static void bnep_net_timeout (struct net_device *dev) +static void bnep_net_timeout (struct net_device *dev,int txqueue) {BT_DBG ("net_timeout" );netif_wake_queue (dev);net/sched/sch_generic.c +0
-0
net/sched/sch_generic.c static void dev_watchdog(struct timer_list *t) · line 452
Quoted 8 lines
net/sched/sch_generic.c +1
-1@@ -446,7 +446,7 @@ static void dev_watchdog(struct timer_list *t)trace_net_dev_xmit_timeout (dev, i);WARN_ONCE (1 ,KERN_INFO "NETDEV WATCHDOG: %s (%s): transmit queue %u timed out\n" , dev->name,netdev_drivername (dev), i); - dev->netdev_ops->ndo_tx_timeout (dev); + dev->netdev_ops->ndo_tx_timeout (dev, i); } if (!mod_timer(&dev->watchdog_timer, round_jiffies(jiffies +
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Michael S. Tsirkin
maintainerQuoted 6 lines · Julio Faracco
Quoted 6 lines
netdev: pass the stuck queue to the timeout handler
This allows incrementing the correct timeout statistic without any mess. Down the road, devices can learn to reset just the specific queue.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Michael S. Tsirkin <[email protected]>---
Warning: untested.Question...
Wouldn't be better to create a module parameter instead change the function scope?
Passing the value in a global variable? That fails to be reentrant ...
Quoted 1 line
I'm asking it because how many modules would effectively take advantage of it?
The cost is effectively 0 though.
Signature · 1 line
MST
Michael S. Tsirkin
maintainerQuoted 6 lines · Julio Faracco
Quoted 6 lines
netdev: pass the stuck queue to the timeout handler
This allows incrementing the correct timeout statistic without any mess. Down the road, devices can learn to reset just the specific queue.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Michael S. Tsirkin <[email protected]>---
Warning: untested.Question...
Wouldn't be better to create a module parameter instead change the function scope?
Passing the value in a global variable? That fails to be reentrant ...
Quoted 1 line
I'm asking it because how many modules would effectively take advantage of it?
The cost is effectively 0 though.
Signature · 1 line
MST
kbuild test robot
build botI love your patch! Yet something to improve:
Hi "Michael,
I love your patch! Yet something to improve:
[auto build test ERROR on net/master]
[also build test ERROR on v5.4-rc8]
[cannot apply to net-next/master next-20191122]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Michael-S-Tsirkin/Re-PATCH-net-next-v2-drivers-net-virtio_net-Implement-a-dev_watchdog-handler/20191124-212126 base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git 312434617cb16be5166316cf9d08ba760b1042a1 config: i386-defconfig (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: # save the attached .config to linux build tree make ARCH=i386
If you fix the issue, kindly add following tag
All errors (new ones prefixed by >>):
>> drivers/net/ethernet/8390/ne2k-pci.c:207:21: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.ndo_tx_timeout = ei_tx_timeout,
^~~~~~~~~~~~~
drivers/net/ethernet/8390/ne2k-pci.c:207:21: note: (near initialization for 'ne2k_netdev_ops.ndo_tx_timeout')
cc1: some warnings being treated as errors
--
>> drivers/net/ethernet/8390/8390.c:39:6: error: conflicting types for 'ei_tx_timeout'
void ei_tx_timeout(struct net_device *dev, int txqueue)
^~~~~~~~~~~~~
In file included from drivers/net/ethernet/8390/lib8390.c:75:0,
from drivers/net/ethernet/8390/8390.c:7:
drivers/net/ethernet/8390/8390.h:35:6: note: previous declaration of 'ei_tx_timeout' was here
void ei_tx_timeout(struct net_device *dev);
^~~~~~~~~~~~~
In file included from include/linux/linkage.h:7:0,
from include/linux/kernel.h:8,
from include/linux/list.h:9,
from include/linux/module.h:9,
from drivers/net/ethernet/8390/lib8390.c:53,
from drivers/net/ethernet/8390/8390.c:7:
drivers/net/ethernet/8390/8390.c:43:15: error: conflicting types for 'ei_tx_timeout'
EXPORT_SYMBOL(ei_tx_timeout);
^
include/linux/export.h:102:21: note: in definition of macro '___export_symbol_common'
extern typeof(sym) sym; \
^~~
include/linux/export.h:169:34: note: in expansion of macro '___EXPORT_SYMBOL'
#define __EXPORT_SYMBOL(sym,sec) ___EXPORT_SYMBOL(sym,sec)
^~~~~~~~~~~~~~~~
include/linux/export.h:179:29: note: in expansion of macro '__EXPORT_SYMBOL'
#define EXPORT_SYMBOL(sym) __EXPORT_SYMBOL(sym, "")
^~~~~~~~~~~~~~~
drivers/net/ethernet/8390/8390.c:43:1: note: in expansion of macro 'EXPORT_SYMBOL'
EXPORT_SYMBOL(ei_tx_timeout);
^~~~~~~~~~~~~
In file included from drivers/net/ethernet/8390/lib8390.c:75:0,
from drivers/net/ethernet/8390/8390.c:7:
drivers/net/ethernet/8390/8390.h:35:6: note: previous declaration of 'ei_tx_timeout' was here
void ei_tx_timeout(struct net_device *dev);
^~~~~~~~~~~~~
--
>> drivers/net/ethernet/realtek/8139too.c:936:21: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types]
.ndo_tx_timeout = rtl8139_tx_timeout,
^~~~~~~~~~~~~~~~~~ drivers/net/ethernet/realtek/8139too.c:936:21: note: (near initialization for 'rtl8139_netdev_ops.ndo_tx_timeout')
cc1: some warnings being treated as errors
vim +/ei_tx_timeout +39 drivers/net/ethernet/8390/8390.c
38
> 39 void ei_tx_timeout(struct net_device *dev, int txqueue)
40 {
41 __ei_tx_timeout(dev);
42 }
43 EXPORT_SYMBOL(ei_tx_timeout);
44 ---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation