netdev: pass the stuck queue to the timeout handler

[linux.git] / drivers / net / ethernet / ti / tlan.c

diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 78f0f2d59e227e754fd584cbb39d7a6d8796d650..ad465202980a4ffc4ef7e08888d8b74e94d9d1e2 100644 (file)
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -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, unsigned 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, unsigned int txqueue)
 {
 
        TLAN_DBG(TLAN_DEBUG_GNRL, "%s: Transmit timed out.\n", dev->name);
@@ -1028,7 +1028,7 @@ static void tlan_tx_timeout_work(struct work_struct *work)
        struct tlan_priv        *priv =
                container_of(work, struct tlan_priv, tlan_tqueue);
 
-       tlan_tx_timeout(priv->dev);
+       tlan_tx_timeout(priv->dev, UINT_MAX);
 }