diff options
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index d126c852b82e..3e4f3fa6acdb 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | |||
@@ -403,7 +403,7 @@ void bnx2x_set_rx_mode(struct net_device *dev); | |||
403 | * If bp->state is OPEN, should be called with | 403 | * If bp->state is OPEN, should be called with |
404 | * netif_addr_lock_bh(). | 404 | * netif_addr_lock_bh(). |
405 | */ | 405 | */ |
406 | void bnx2x_set_storm_rx_mode(struct bnx2x *bp); | 406 | int bnx2x_set_storm_rx_mode(struct bnx2x *bp); |
407 | 407 | ||
408 | /** | 408 | /** |
409 | * bnx2x_set_q_rx_mode - configures rx_mode for a single queue. | 409 | * bnx2x_set_q_rx_mode - configures rx_mode for a single queue. |
@@ -415,11 +415,11 @@ void bnx2x_set_storm_rx_mode(struct bnx2x *bp); | |||
415 | * @tx_accept_flags: tx accept configuration (tx switch) | 415 | * @tx_accept_flags: tx accept configuration (tx switch) |
416 | * @ramrod_flags: ramrod configuration | 416 | * @ramrod_flags: ramrod configuration |
417 | */ | 417 | */ |
418 | void bnx2x_set_q_rx_mode(struct bnx2x *bp, u8 cl_id, | 418 | int bnx2x_set_q_rx_mode(struct bnx2x *bp, u8 cl_id, |
419 | unsigned long rx_mode_flags, | 419 | unsigned long rx_mode_flags, |
420 | unsigned long rx_accept_flags, | 420 | unsigned long rx_accept_flags, |
421 | unsigned long tx_accept_flags, | 421 | unsigned long tx_accept_flags, |
422 | unsigned long ramrod_flags); | 422 | unsigned long ramrod_flags); |
423 | 423 | ||
424 | /* Parity errors related */ | 424 | /* Parity errors related */ |
425 | void bnx2x_set_pf_load(struct bnx2x *bp); | 425 | void bnx2x_set_pf_load(struct bnx2x *bp); |
@@ -821,7 +821,7 @@ static inline void bnx2x_free_rx_sge(struct bnx2x *bp, | |||
821 | return; | 821 | return; |
822 | 822 | ||
823 | dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(sw_buf, mapping), | 823 | dma_unmap_page(&bp->pdev->dev, dma_unmap_addr(sw_buf, mapping), |
824 | SGE_PAGE_SIZE*PAGES_PER_SGE, DMA_FROM_DEVICE); | 824 | SGE_PAGES, DMA_FROM_DEVICE); |
825 | __free_pages(page, PAGES_PER_SGE_SHIFT); | 825 | __free_pages(page, PAGES_PER_SGE_SHIFT); |
826 | 826 | ||
827 | sw_buf->page = NULL; | 827 | sw_buf->page = NULL; |