Commit c63fdf46 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

drivers/net: normalize TX_TIMEOUT

Some network drivers use old TX_TIMEOUT definitions, assuming HZ=100 of
old kernels.

Convert these definitions to include HZ, since HZ can be 1000 these
days.
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 973a34aa
...@@ -201,7 +201,7 @@ struct net_local { ...@@ -201,7 +201,7 @@ struct net_local {
#define RX_BUF_SIZE (1518+14+18) /* packet+header+RBD */ #define RX_BUF_SIZE (1518+14+18) /* packet+header+RBD */
#define RX_BUF_END (dev->mem_end - dev->mem_start) #define RX_BUF_END (dev->mem_end - dev->mem_start)
#define TX_TIMEOUT 5 #define TX_TIMEOUT (HZ/20)
/* /*
That's it: only 86 bytes to set up the beast, including every extra That's it: only 86 bytes to set up the beast, including every extra
......
...@@ -98,7 +98,7 @@ static int rx_nocopy, rx_copy, queued_packet; ...@@ -98,7 +98,7 @@ static int rx_nocopy, rx_copy, queued_packet;
#define WAIT_TX_AVAIL 200 #define WAIT_TX_AVAIL 200
/* Operational parameter that usually are not changed. */ /* Operational parameter that usually are not changed. */
#define TX_TIMEOUT 40 /* Time in jiffies before concluding Tx hung */ #define TX_TIMEOUT ((4*HZ)/10) /* Time in jiffies before concluding Tx hung */
/* The size here is somewhat misleading: the Corkscrew also uses the ISA /* The size here is somewhat misleading: the Corkscrew also uses the ISA
aliased registers at <base>+0x400. aliased registers at <base>+0x400.
......
...@@ -191,7 +191,7 @@ enum commands { ...@@ -191,7 +191,7 @@ enum commands {
#define RX_SUSPEND 0x0030 #define RX_SUSPEND 0x0030
#define RX_ABORT 0x0040 #define RX_ABORT 0x0040
#define TX_TIMEOUT 5 #define TX_TIMEOUT (HZ/20)
struct i596_reg { struct i596_reg {
......
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
#define TX_DESC_SIZE 10 #define TX_DESC_SIZE 10
#define MAX_RBUFF_SZ 0x600 #define MAX_RBUFF_SZ 0x600
#define MAX_TBUFF_SZ 0x600 #define MAX_TBUFF_SZ 0x600
#define TX_TIMEOUT 50 #define TX_TIMEOUT (HZ/2)
#define DELAY 1000 #define DELAY 1000
#define CAM0 0x0 #define CAM0 0x0
......
...@@ -150,7 +150,7 @@ struct net_local { ...@@ -150,7 +150,7 @@ struct net_local {
#define PORT_OFFSET(o) (o) #define PORT_OFFSET(o) (o)
#define TX_TIMEOUT 10 #define TX_TIMEOUT (HZ/10)
/* Index to functions, as function prototypes. */ /* Index to functions, as function prototypes. */
......
...@@ -116,7 +116,7 @@ MODULE_LICENSE("GPL"); ...@@ -116,7 +116,7 @@ MODULE_LICENSE("GPL");
#define RX_RING_LEN_BITS (RX_LOG_RING_SIZE << 5) #define RX_RING_LEN_BITS (RX_LOG_RING_SIZE << 5)
#define RX_RING_MOD_MASK (RX_RING_SIZE - 1) #define RX_RING_MOD_MASK (RX_RING_SIZE - 1)
#define TX_TIMEOUT 20 #define TX_TIMEOUT (HZ/5)
/* The LANCE Rx and Tx ring descriptors. */ /* The LANCE Rx and Tx ring descriptors. */
struct lance_rx_head { struct lance_rx_head {
......
...@@ -302,7 +302,7 @@ struct eepro_local { ...@@ -302,7 +302,7 @@ struct eepro_local {
#define ee_id_eepro10p0 0x10 /* ID for eepro/10+ */ #define ee_id_eepro10p0 0x10 /* ID for eepro/10+ */
#define ee_id_eepro10p1 0x31 #define ee_id_eepro10p1 0x31
#define TX_TIMEOUT 40 #define TX_TIMEOUT ((4*HZ)/10)
/* Index to functions, as function prototypes. */ /* Index to functions, as function prototypes. */
......
...@@ -207,7 +207,7 @@ tx_full and tbusy flags. ...@@ -207,7 +207,7 @@ tx_full and tbusy flags.
#define LANCE_BUS_IF 0x16 #define LANCE_BUS_IF 0x16
#define LANCE_TOTAL_SIZE 0x18 #define LANCE_TOTAL_SIZE 0x18
#define TX_TIMEOUT 20 #define TX_TIMEOUT (HZ/5)
/* The LANCE Rx and Tx ring descriptors. */ /* The LANCE Rx and Tx ring descriptors. */
struct lance_rx_head { struct lance_rx_head {
......
...@@ -161,7 +161,7 @@ enum commands { ...@@ -161,7 +161,7 @@ enum commands {
#define RX_SUSPEND 0x0030 #define RX_SUSPEND 0x0030
#define RX_ABORT 0x0040 #define RX_ABORT 0x0040
#define TX_TIMEOUT 5 #define TX_TIMEOUT (HZ/20)
struct i596_reg { struct i596_reg {
......
...@@ -124,7 +124,7 @@ MODULE_LICENSE("GPL"); ...@@ -124,7 +124,7 @@ MODULE_LICENSE("GPL");
#define TX_BUF_SIZE 8192 #define TX_BUF_SIZE 8192
#define DMA_BUF_SIZE (RX_BUF_SIZE + 16) /* 8k + 16 bytes for trailers */ #define DMA_BUF_SIZE (RX_BUF_SIZE + 16) /* 8k + 16 bytes for trailers */
#define TX_TIMEOUT 10 #define TX_TIMEOUT (HZ/10)
struct znet_private { struct znet_private {
int rx_dma, tx_dma; int rx_dma, tx_dma;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment