diff options
-rw-r--r-- | drivers/net/3c507.c | 2 | ||||
-rw-r--r-- | drivers/net/3c515.c | 2 | ||||
-rw-r--r-- | drivers/net/82596.c | 2 | ||||
-rw-r--r-- | drivers/net/arm/w90p910_ether.c | 2 | ||||
-rw-r--r-- | drivers/net/at1700.c | 2 | ||||
-rw-r--r-- | drivers/net/atarilance.c | 2 | ||||
-rw-r--r-- | drivers/net/eepro.c | 2 | ||||
-rw-r--r-- | drivers/net/lance.c | 2 | ||||
-rw-r--r-- | drivers/net/lib82596.c | 2 | ||||
-rw-r--r-- | drivers/net/znet.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index ea9b7a098c9b..475a66d95b34 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
@@ -201,7 +201,7 @@ struct net_local { | |||
201 | #define RX_BUF_SIZE (1518+14+18) /* packet+header+RBD */ | 201 | #define RX_BUF_SIZE (1518+14+18) /* packet+header+RBD */ |
202 | #define RX_BUF_END (dev->mem_end - dev->mem_start) | 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 | That's it: only 86 bytes to set up the beast, including every extra | 207 | That's it: only 86 bytes to set up the beast, including every extra |
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index cdf7226a7c43..d2bb4b254c57 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
@@ -98,7 +98,7 @@ static int rx_nocopy, rx_copy, queued_packet; | |||
98 | #define WAIT_TX_AVAIL 200 | 98 | #define WAIT_TX_AVAIL 200 |
99 | 99 | ||
100 | /* Operational parameter that usually are not changed. */ | 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 | /* The size here is somewhat misleading: the Corkscrew also uses the ISA | 103 | /* The size here is somewhat misleading: the Corkscrew also uses the ISA |
104 | aliased registers at <base>+0x400. | 104 | aliased registers at <base>+0x400. |
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index e2c9c5b949f9..be1f1970c842 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
@@ -191,7 +191,7 @@ enum commands { | |||
191 | #define RX_SUSPEND 0x0030 | 191 | #define RX_SUSPEND 0x0030 |
192 | #define RX_ABORT 0x0040 | 192 | #define RX_ABORT 0x0040 |
193 | 193 | ||
194 | #define TX_TIMEOUT 5 | 194 | #define TX_TIMEOUT (HZ/20) |
195 | 195 | ||
196 | 196 | ||
197 | struct i596_reg { | 197 | struct i596_reg { |
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c index 4545d5a06c24..bfea499a3513 100644 --- a/drivers/net/arm/w90p910_ether.c +++ b/drivers/net/arm/w90p910_ether.c | |||
@@ -117,7 +117,7 @@ | |||
117 | #define TX_DESC_SIZE 10 | 117 | #define TX_DESC_SIZE 10 |
118 | #define MAX_RBUFF_SZ 0x600 | 118 | #define MAX_RBUFF_SZ 0x600 |
119 | #define MAX_TBUFF_SZ 0x600 | 119 | #define MAX_TBUFF_SZ 0x600 |
120 | #define TX_TIMEOUT 50 | 120 | #define TX_TIMEOUT (HZ/2) |
121 | #define DELAY 1000 | 121 | #define DELAY 1000 |
122 | #define CAM0 0x0 | 122 | #define CAM0 0x0 |
123 | 123 | ||
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 89876897a6fe..871b1633f543 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
@@ -150,7 +150,7 @@ struct net_local { | |||
150 | #define PORT_OFFSET(o) (o) | 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 | /* Index to functions, as function prototypes. */ | 156 | /* Index to functions, as function prototypes. */ |
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 8cb27cb7bca1..ce0091eb06f5 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
@@ -116,7 +116,7 @@ MODULE_LICENSE("GPL"); | |||
116 | #define RX_RING_LEN_BITS (RX_LOG_RING_SIZE << 5) | 116 | #define RX_RING_LEN_BITS (RX_LOG_RING_SIZE << 5) |
117 | #define RX_RING_MOD_MASK (RX_RING_SIZE - 1) | 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 | /* The LANCE Rx and Tx ring descriptors. */ | 121 | /* The LANCE Rx and Tx ring descriptors. */ |
122 | struct lance_rx_head { | 122 | struct lance_rx_head { |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 7c826319ee5a..9e19fbc2f176 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
@@ -302,7 +302,7 @@ struct eepro_local { | |||
302 | #define ee_id_eepro10p0 0x10 /* ID for eepro/10+ */ | 302 | #define ee_id_eepro10p0 0x10 /* ID for eepro/10+ */ |
303 | #define ee_id_eepro10p1 0x31 | 303 | #define ee_id_eepro10p1 0x31 |
304 | 304 | ||
305 | #define TX_TIMEOUT 40 | 305 | #define TX_TIMEOUT ((4*HZ)/10) |
306 | 306 | ||
307 | /* Index to functions, as function prototypes. */ | 307 | /* Index to functions, as function prototypes. */ |
308 | 308 | ||
diff --git a/drivers/net/lance.c b/drivers/net/lance.c index f06296bfe293..02336edce748 100644 --- a/drivers/net/lance.c +++ b/drivers/net/lance.c | |||
@@ -207,7 +207,7 @@ tx_full and tbusy flags. | |||
207 | #define LANCE_BUS_IF 0x16 | 207 | #define LANCE_BUS_IF 0x16 |
208 | #define LANCE_TOTAL_SIZE 0x18 | 208 | #define LANCE_TOTAL_SIZE 0x18 |
209 | 209 | ||
210 | #define TX_TIMEOUT 20 | 210 | #define TX_TIMEOUT (HZ/5) |
211 | 211 | ||
212 | /* The LANCE Rx and Tx ring descriptors. */ | 212 | /* The LANCE Rx and Tx ring descriptors. */ |
213 | struct lance_rx_head { | 213 | struct lance_rx_head { |
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index c27f4291b350..9e042894479b 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -161,7 +161,7 @@ enum commands { | |||
161 | #define RX_SUSPEND 0x0030 | 161 | #define RX_SUSPEND 0x0030 |
162 | #define RX_ABORT 0x0040 | 162 | #define RX_ABORT 0x0040 |
163 | 163 | ||
164 | #define TX_TIMEOUT 5 | 164 | #define TX_TIMEOUT (HZ/20) |
165 | 165 | ||
166 | 166 | ||
167 | struct i596_reg { | 167 | struct i596_reg { |
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index c3a329204511..ae07b3dfbcc1 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
@@ -124,7 +124,7 @@ MODULE_LICENSE("GPL"); | |||
124 | #define TX_BUF_SIZE 8192 | 124 | #define TX_BUF_SIZE 8192 |
125 | #define DMA_BUF_SIZE (RX_BUF_SIZE + 16) /* 8k + 16 bytes for trailers */ | 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 | struct znet_private { | 129 | struct znet_private { |
130 | int rx_dma, tx_dma; | 130 | int rx_dma, tx_dma; |