diff options
Diffstat (limited to 'drivers/net/skfp/hwmtm.c')
-rw-r--r-- | drivers/net/skfp/hwmtm.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c index d322f1b702ac..af5a755e269d 100644 --- a/drivers/net/skfp/hwmtm.c +++ b/drivers/net/skfp/hwmtm.c | |||
@@ -232,16 +232,16 @@ u_int mac_drv_check_space(void) | |||
232 | #ifdef COMMON_MB_POOL | 232 | #ifdef COMMON_MB_POOL |
233 | call_count++ ; | 233 | call_count++ ; |
234 | if (call_count == 1) { | 234 | if (call_count == 1) { |
235 | return(EXT_VIRT_MEM) ; | 235 | return EXT_VIRT_MEM; |
236 | } | 236 | } |
237 | else { | 237 | else { |
238 | return(EXT_VIRT_MEM_2) ; | 238 | return EXT_VIRT_MEM_2; |
239 | } | 239 | } |
240 | #else | 240 | #else |
241 | return (EXT_VIRT_MEM) ; | 241 | return EXT_VIRT_MEM; |
242 | #endif | 242 | #endif |
243 | #else | 243 | #else |
244 | return (0) ; | 244 | return 0; |
245 | #endif | 245 | #endif |
246 | } | 246 | } |
247 | 247 | ||
@@ -271,7 +271,7 @@ int mac_drv_init(struct s_smc *smc) | |||
271 | if (!(smc->os.hwm.descr_p = (union s_fp_descr volatile *) | 271 | if (!(smc->os.hwm.descr_p = (union s_fp_descr volatile *) |
272 | mac_drv_get_desc_mem(smc,(u_int) | 272 | mac_drv_get_desc_mem(smc,(u_int) |
273 | (RXD_TXD_COUNT+1)*sizeof(struct s_smt_fp_txd)))) { | 273 | (RXD_TXD_COUNT+1)*sizeof(struct s_smt_fp_txd)))) { |
274 | return(1) ; /* no space the hwm modul can't work */ | 274 | return 1; /* no space the hwm modul can't work */ |
275 | } | 275 | } |
276 | 276 | ||
277 | /* | 277 | /* |
@@ -283,18 +283,18 @@ int mac_drv_init(struct s_smc *smc) | |||
283 | #ifndef COMMON_MB_POOL | 283 | #ifndef COMMON_MB_POOL |
284 | if (!(smc->os.hwm.mbuf_pool.mb_start = (SMbuf *) mac_drv_get_space(smc, | 284 | if (!(smc->os.hwm.mbuf_pool.mb_start = (SMbuf *) mac_drv_get_space(smc, |
285 | MAX_MBUF*sizeof(SMbuf)))) { | 285 | MAX_MBUF*sizeof(SMbuf)))) { |
286 | return(1) ; /* no space the hwm modul can't work */ | 286 | return 1; /* no space the hwm modul can't work */ |
287 | } | 287 | } |
288 | #else | 288 | #else |
289 | if (!mb_start) { | 289 | if (!mb_start) { |
290 | if (!(mb_start = (SMbuf *) mac_drv_get_space(smc, | 290 | if (!(mb_start = (SMbuf *) mac_drv_get_space(smc, |
291 | MAX_MBUF*sizeof(SMbuf)))) { | 291 | MAX_MBUF*sizeof(SMbuf)))) { |
292 | return(1) ; /* no space the hwm modul can't work */ | 292 | return 1; /* no space the hwm modul can't work */ |
293 | } | 293 | } |
294 | } | 294 | } |
295 | #endif | 295 | #endif |
296 | #endif | 296 | #endif |
297 | return (0) ; | 297 | return 0; |
298 | } | 298 | } |
299 | 299 | ||
300 | /* | 300 | /* |
@@ -349,7 +349,7 @@ static u_long init_descr_ring(struct s_smc *smc, | |||
349 | DRV_BUF_FLUSH(&d1->r,DDI_DMA_SYNC_FORDEV) ; | 349 | DRV_BUF_FLUSH(&d1->r,DDI_DMA_SYNC_FORDEV) ; |
350 | d1++; | 350 | d1++; |
351 | } | 351 | } |
352 | return(phys) ; | 352 | return phys; |
353 | } | 353 | } |
354 | 354 | ||
355 | static void init_txd_ring(struct s_smc *smc) | 355 | static void init_txd_ring(struct s_smc *smc) |
@@ -502,7 +502,7 @@ SMbuf *smt_get_mbuf(struct s_smc *smc) | |||
502 | mb->sm_use_count = 1 ; | 502 | mb->sm_use_count = 1 ; |
503 | } | 503 | } |
504 | DB_GEN("get SMbuf: mb = %x",(void *)mb,0,3) ; | 504 | DB_GEN("get SMbuf: mb = %x",(void *)mb,0,3) ; |
505 | return (mb) ; /* May be NULL */ | 505 | return mb; /* May be NULL */ |
506 | } | 506 | } |
507 | 507 | ||
508 | void smt_free_mbuf(struct s_smc *smc, SMbuf *mb) | 508 | void smt_free_mbuf(struct s_smc *smc, SMbuf *mb) |
@@ -621,7 +621,7 @@ static u_long repair_txd_ring(struct s_smc *smc, struct s_smt_tx_queue *queue) | |||
621 | t = t->txd_next ; | 621 | t = t->txd_next ; |
622 | tx_used-- ; | 622 | tx_used-- ; |
623 | } | 623 | } |
624 | return(phys) ; | 624 | return phys; |
625 | } | 625 | } |
626 | 626 | ||
627 | /* | 627 | /* |
@@ -673,7 +673,7 @@ static u_long repair_rxd_ring(struct s_smc *smc, struct s_smt_rx_queue *queue) | |||
673 | r = r->rxd_next ; | 673 | r = r->rxd_next ; |
674 | rx_used-- ; | 674 | rx_used-- ; |
675 | } | 675 | } |
676 | return(phys) ; | 676 | return phys; |
677 | } | 677 | } |
678 | 678 | ||
679 | 679 | ||
@@ -1595,7 +1595,7 @@ int hwm_tx_init(struct s_smc *smc, u_char fc, int frag_count, int frame_len, | |||
1595 | } | 1595 | } |
1596 | DB_TX("frame_status = %x",frame_status,0,3) ; | 1596 | DB_TX("frame_status = %x",frame_status,0,3) ; |
1597 | NDD_TRACE("THiE",frame_status,smc->os.hwm.tx_p->tx_free,0) ; | 1597 | NDD_TRACE("THiE",frame_status,smc->os.hwm.tx_p->tx_free,0) ; |
1598 | return(frame_status) ; | 1598 | return frame_status; |
1599 | } | 1599 | } |
1600 | 1600 | ||
1601 | /* | 1601 | /* |
@@ -1764,7 +1764,7 @@ static SMbuf *get_llc_rx(struct s_smc *smc) | |||
1764 | smc->os.hwm.llc_rx_pipe = mb->sm_next ; | 1764 | smc->os.hwm.llc_rx_pipe = mb->sm_next ; |
1765 | } | 1765 | } |
1766 | DB_GEN("get_llc_rx: mb = 0x%x",(void *)mb,0,4) ; | 1766 | DB_GEN("get_llc_rx: mb = 0x%x",(void *)mb,0,4) ; |
1767 | return(mb) ; | 1767 | return mb; |
1768 | } | 1768 | } |
1769 | 1769 | ||
1770 | /* | 1770 | /* |
@@ -1797,7 +1797,7 @@ static SMbuf *get_txd_mb(struct s_smc *smc) | |||
1797 | smc->os.hwm.txd_tx_pipe = mb->sm_next ; | 1797 | smc->os.hwm.txd_tx_pipe = mb->sm_next ; |
1798 | } | 1798 | } |
1799 | DB_GEN("get_txd_mb: mb = 0x%x",(void *)mb,0,4) ; | 1799 | DB_GEN("get_txd_mb: mb = 0x%x",(void *)mb,0,4) ; |
1800 | return(mb) ; | 1800 | return mb; |
1801 | } | 1801 | } |
1802 | 1802 | ||
1803 | /* | 1803 | /* |