Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed sunxi-gmac integer overflow for DMA address when system has mor…
…e than 1GB memory.
  • Loading branch information
longsleep committed Apr 3, 2016
1 parent b44d032 commit c249f7a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/allwinner/sunxi-gmac.h
Expand Up @@ -293,7 +293,7 @@ void desc_tx_close(struct dma_desc *first, struct dma_desc *end, int csum_insert
void desc_init(struct dma_desc *p);
int desc_get_tx_status(struct dma_desc *desc, struct geth_extra_stats *x);
int desc_buf_get_len(struct dma_desc *desc);
int desc_buf_get_addr(struct dma_desc *desc);
unsigned long desc_buf_get_addr(struct dma_desc *desc);
int desc_get_rx_status(struct dma_desc *desc, struct geth_extra_stats *x);
int desc_get_own(struct dma_desc *desc);
int desc_get_tx_ls(struct dma_desc *desc);
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/allwinner/sunxi_gmac_ops.c
Expand Up @@ -609,7 +609,7 @@ int desc_buf_get_len(struct dma_desc *desc)
return (desc->desc1.all & ((1 << 11) - 1));
}

int desc_buf_get_addr(struct dma_desc *desc)
unsigned long desc_buf_get_addr(struct dma_desc *desc)
{
return desc->desc2;
}
Expand Down

0 comments on commit c249f7a

Please sign in to comment.