Skip to content

Don't use AX25 pointer for netmap #53

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
wants to merge 1 commit into
base: 19a7eb6a-atl
Choose a base branch
from
Open

Don't use AX25 pointer for netmap #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions LINUX/bsd_glue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,17 @@ struct thread;
* in linux we have no spares so we overload ax25_ptr, and the detection
* for netmap-capable is some magic in the area pointed by that.
*/
#ifdef ATL_CHANGE
#define ML_PRIV_TYPE 0x4e4d4150 /* unique value to use for priv type */
#define if_setnetmapadapter(_ifp, _na) netdev_set_ml_priv((_ifp), (_na), ML_PRIV_TYPE)
#define if_getnetmapadapter(_ifp) ((struct netmap_adapter *)netdev_get_ml_priv((_ifp), ML_PRIV_TYPE))
#else
#define if_setnetmapadapter(_ifp, _na) do { \
(_ifp)->ax25_ptr = _na; \
} while (0)
#define if_getnetmapadapter(_ifp) ((struct netmap_adapter *)(_ifp)->ax25_ptr)

#endif /* ATL_CHANGE */
/* use the default NM_ATTACH_NA/NM_DETACH_NA defined in netmap_kernel.h */
#else /* !NETMAP_LINUX_HAVE_AX25PTR */
/*
Expand Down
2 changes: 1 addition & 1 deletion LINUX/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ EOF

void * dummy(struct net_device *dev)
{
return dev->ax25_ptr;
return dev->ml_priv; // ATL_CHANGE
}
EOF

Expand Down