Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Eric Dumazet and committed by
David S. Miller
c63fdf46 973a34aa

+10 -10
+1 -1
drivers/net/3c507.c
··· 201 201 #define RX_BUF_SIZE (1518+14+18) /* packet+header+RBD */ 202 202 #define RX_BUF_END (dev->mem_end - dev->mem_start) 203 203 204 - #define TX_TIMEOUT 5 204 + #define TX_TIMEOUT (HZ/20) 205 205 206 206 /* 207 207 That's it: only 86 bytes to set up the beast, including every extra
+1 -1
drivers/net/3c515.c
··· 98 98 #define WAIT_TX_AVAIL 200 99 99 100 100 /* Operational parameter that usually are not changed. */ 101 - #define TX_TIMEOUT 40 /* Time in jiffies before concluding Tx hung */ 101 + #define TX_TIMEOUT ((4*HZ)/10) /* Time in jiffies before concluding Tx hung */ 102 102 103 103 /* The size here is somewhat misleading: the Corkscrew also uses the ISA 104 104 aliased registers at <base>+0x400.
+1 -1
drivers/net/82596.c
··· 191 191 #define RX_SUSPEND 0x0030 192 192 #define RX_ABORT 0x0040 193 193 194 - #define TX_TIMEOUT 5 194 + #define TX_TIMEOUT (HZ/20) 195 195 196 196 197 197 struct i596_reg {
+1 -1
drivers/net/arm/w90p910_ether.c
··· 117 117 #define TX_DESC_SIZE 10 118 118 #define MAX_RBUFF_SZ 0x600 119 119 #define MAX_TBUFF_SZ 0x600 120 - #define TX_TIMEOUT 50 120 + #define TX_TIMEOUT (HZ/2) 121 121 #define DELAY 1000 122 122 #define CAM0 0x0 123 123
+1 -1
drivers/net/at1700.c
··· 150 150 #define PORT_OFFSET(o) (o) 151 151 152 152 153 - #define TX_TIMEOUT 10 153 + #define TX_TIMEOUT (HZ/10) 154 154 155 155 156 156 /* Index to functions, as function prototypes. */
+1 -1
drivers/net/atarilance.c
··· 116 116 #define RX_RING_LEN_BITS (RX_LOG_RING_SIZE << 5) 117 117 #define RX_RING_MOD_MASK (RX_RING_SIZE - 1) 118 118 119 - #define TX_TIMEOUT 20 119 + #define TX_TIMEOUT (HZ/5) 120 120 121 121 /* The LANCE Rx and Tx ring descriptors. */ 122 122 struct lance_rx_head {
+1 -1
drivers/net/eepro.c
··· 302 302 #define ee_id_eepro10p0 0x10 /* ID for eepro/10+ */ 303 303 #define ee_id_eepro10p1 0x31 304 304 305 - #define TX_TIMEOUT 40 305 + #define TX_TIMEOUT ((4*HZ)/10) 306 306 307 307 /* Index to functions, as function prototypes. */ 308 308
+1 -1
drivers/net/lance.c
··· 207 207 #define LANCE_BUS_IF 0x16 208 208 #define LANCE_TOTAL_SIZE 0x18 209 209 210 - #define TX_TIMEOUT 20 210 + #define TX_TIMEOUT (HZ/5) 211 211 212 212 /* The LANCE Rx and Tx ring descriptors. */ 213 213 struct lance_rx_head {
+1 -1
drivers/net/lib82596.c
··· 161 161 #define RX_SUSPEND 0x0030 162 162 #define RX_ABORT 0x0040 163 163 164 - #define TX_TIMEOUT 5 164 + #define TX_TIMEOUT (HZ/20) 165 165 166 166 167 167 struct i596_reg {
+1 -1
drivers/net/znet.c
··· 124 124 #define TX_BUF_SIZE 8192 125 125 #define DMA_BUF_SIZE (RX_BUF_SIZE + 16) /* 8k + 16 bytes for trailers */ 126 126 127 - #define TX_TIMEOUT 10 127 + #define TX_TIMEOUT (HZ/10) 128 128 129 129 struct znet_private { 130 130 int rx_dma, tx_dma;