diff options
| author | adrian <adrian@FreeBSD.org> | 2012-01-15 19:45:23 +0000 |
|---|---|---|
| committer | adrian <adrian@FreeBSD.org> | 2012-01-15 19:45:23 +0000 |
| commit | 67dd0ca2547a8ce8b86b7f88b4ccee6e14abeb4c (patch) | |
| tree | 959a0ba9f1a6d42cc79ab0046df582c20e694fa5 | |
| parent | 09ed01a8f625cb65d563a5565e880a01c5297390 (diff) | |
| download | FreeBSD-src-67dd0ca2547a8ce8b86b7f88b4ccee6e14abeb4c.zip FreeBSD-src-67dd0ca2547a8ce8b86b7f88b4ccee6e14abeb4c.tar.gz | |
Fix the situation where net80211 is built with IEEE80211_SUPPORT_TDMA but a module
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.
| -rw-r--r-- | sys/modules/wlan/Makefile | 3 | ||||
| -rw-r--r-- | sys/net80211/ieee80211_tdma.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile index f96ad32..8eb83bf 100644 --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -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 diff --git a/sys/net80211/ieee80211_tdma.c b/sys/net80211/ieee80211_tdma.c index 077b9e4..ece82ff 100644 --- a/sys/net80211/ieee80211_tdma.c +++ b/sys/net80211/ieee80211_tdma.c @@ -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 @@ restart: return ERESTART; } IEEE80211_IOCTL_SET(tdma, tdma_ioctl_set80211); + +#endif /* IEEE80211_SUPPORT_TDMA */ |
