Skip to content

fix main.c for kernel 5 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dniwelive wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix main.c for kernel 5 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b651473
fix main.c for kernel 5
dniwelive Aug 15, 2019
116f988
Update README.md
dniwelive Aug 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ sudo depmod
Tun and done!


The above sources were taken from kernel version 4.12
The above sources were taken from kernel version 4.12 and slightly modified for newer kernel

They appear to work fine on 4.17.2 as well
They appear to work fine on 5.0.0 as well

And here is the faulty commit:

Expand Down
8 changes: 4 additions & 4 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,10 +660,10 @@ static int alx_alloc_rings(struct alx_priv *alx)
alx->num_txq +
sizeof(struct alx_rrd) * alx->rx_ringsz +
sizeof(struct alx_rfd) * alx->rx_ringsz;
alx->descmem.virt = dma_zalloc_coherent(&alx->hw.pdev->dev,
alx->descmem.size,
&alx->descmem.dma,
GFP_KERNEL);
alx->descmem.virt = dma_alloc_coherent(&alx->hw.pdev->dev,
alx->descmem.size,
&alx->descmem.dma,
GFP_KERNEL);
if (!alx->descmem.virt)
return -ENOMEM;

Expand Down