Commit 1f4782ae authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netdev-ndo_tx_timeout-cleanup' 



Michael S. Tsirkin says:

====================
netdev: ndo_tx_timeout cleanup

Yet another forward declaration I missed. Hopfully the last one ...

A bunch of drivers want to know which tx queue triggered a timeout,
and virtio wants to do the same.
We actually have the info to hand, let's just pass it on to drivers.
Note: tested with an experimental virtio patch by Julio.
That patch itself isn't ready yet though, so not included.
Other drivers compiled only.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 355979de d8968eda

arch/m68k/emu/nfeth.c

+1 −1
Original line number Diff line number Diff line
@@ -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, unsigned int txqueue)

{

	dev->stats.tx_errors++;

	netif_wake_queue(dev);

arch/um/drivers/net_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -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, unsigned int txqueue)

{

	netif_trans_update(dev);

	netif_wake_queue(dev);

arch/um/drivers/vector_kern.c

+1 −1
Original line number Diff line number Diff line
@@ -1332,7 +1332,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, unsigned int txqueue)

{

	struct vector_private *vp = netdev_priv(dev);

arch/xtensa/platforms/iss/network.c

+1 −1
Original line number Diff line number Diff line
@@ -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, unsigned int txqueue)

{

}

drivers/char/pcmcia/synclink_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -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, unsigned int txqueue)

{

	MGSLPC_INFO *info = dev_to_port(dev);

	unsigned long flags;

CRA Git | Maintained and supported by SUSTech CRA and CCSE