d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the situation where net80211 is built with IEEE80211_SUPPORT_TDMA but a module

Browse Source 
is used.

Although the module _builds_, it fails to load because of a missing symbol from
ieee80211_tdma.c.

Specifics:

* Always build ieee80211_tdma.c in the module;
* only compile in the code if IEEE80211_SUPPORT_TDMA is defined.
This commit is contained in:
Adrian Chadd 2012-01-15 19:45:23 +00:00
parent 46efd63a5b
commit 4aecc339cf
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/modules/wlan/Makefile
View File

@ -11,7 +11,8 @@ SRCS= ieee80211.c ieee80211_action.c ieee80211_ageq.c \
ieee80211_scan_sta.c ieee80211_radiotap.c ieee80211_ratectl.c \
ieee80211_ratectl_none.c ieee80211_regdomain.c \
ieee80211_ht.c ieee80211_hwmp.c ieee80211_adhoc.c ieee80211_hostap.c \
ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c
ieee80211_monitor.c ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c \
ieee80211_tdma.c
SRCS+= bus_if.h device_if.h opt_inet.h opt_inet6.h opt_ipx.h opt_wlan.h \
opt_ddb.h

4
sys/net80211/ieee80211_tdma.c
View File

@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
#include "opt_tdma.h"
#include "opt_wlan.h"
#ifdef IEEE80211_SUPPORT_TDMA
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/mbuf.h>
@ -820,3 +822,5 @@ tdma_ioctl_set80211(struct ieee80211vap *vap, struct ieee80211req *ireq)
return ERESTART;
}
IEEE80211_IOCTL_SET(tdma, tdma_ioctl_set80211);
#endif /* IEEE80211_SUPPORT_TDMA */