projects
/
openwrt
/
staging
/
blogic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
netdev: pass the stuck queue to the timeout handler
[openwrt/staging/blogic.git]
/
drivers
/
net
/
ethernet
/
microchip
/
encx24j600.c
diff --git
a/drivers/net/ethernet/microchip/encx24j600.c
b/drivers/net/ethernet/microchip/encx24j600.c
index 52c41d11f56560b7dc2b8eaacdc7599e2759a48a..39925e4bf2ecb4a8d8304c2b36b90a3fd80a2b60 100644
(file)
--- a/
drivers/net/ethernet/microchip/encx24j600.c
+++ b/
drivers/net/ethernet/microchip/encx24j600.c
@@
-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
, unsigned int txqueue
)
{
struct encx24j600_priv *priv = netdev_priv(dev);