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

Allow net80211 to be built on -9 and -8.

Browse Source 
There are some people who use the -HEAD net80211 and wireless drivers
on earlier FreeBSD versions in order to get the updated 802.11n support.
The previous if_clone API changes broke this.
This commit is contained in:
adrian 2012-10-26 19:06:24 +00:00
parent 1bc1b805d7
commit fd573bf186
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/net80211/ieee80211_freebsd.c
View File

@ -65,9 +65,10 @@ SYSCTL_INT(_net_wlan, OID_AUTO, debug, CTLFLAG_RW, &ieee80211_debug,
static MALLOC_DEFINE(M_80211_COM, "80211com", "802.11 com state"); static MALLOC_DEFINE(M_80211_COM, "80211com", "802.11 com state");
#if __FreeBSD_version >= 1000020
static const char wlanname[] = "wlan"; static const char wlanname[] = "wlan";
static struct if_clone *wlan_cloner; static struct if_clone *wlan_cloner;
#endif
/* /*
* Allocate/free com structure in conjunction with ifnet; * Allocate/free com structure in conjunction with ifnet;
@ -133,10 +134,19 @@ wlan_clone_create(struct if_clone *ifc, int unit, caddr_t params)
if_printf(ifp, "TDMA not supported\n"); if_printf(ifp, "TDMA not supported\n");
return EOPNOTSUPP; return EOPNOTSUPP;
} }
#if __FreeBSD_version >= 1000020
vap = ic->ic_vap_create(ic, wlanname, unit, vap = ic->ic_vap_create(ic, wlanname, unit,
cp.icp_opmode, cp.icp_flags, cp.icp_bssid, cp.icp_opmode, cp.icp_flags, cp.icp_bssid,
cp.icp_flags & IEEE80211_CLONE_MACADDR ? cp.icp_flags & IEEE80211_CLONE_MACADDR ?
cp.icp_macaddr : (const uint8_t *)IF_LLADDR(ifp)); cp.icp_macaddr : (const uint8_t *)IF_LLADDR(ifp));
#else
vap = ic->ic_vap_create(ic, ifc->ifc_name, unit,
cp.icp_opmode, cp.icp_flags, cp.icp_bssid,
cp.icp_flags & IEEE80211_CLONE_MACADDR ?
cp.icp_macaddr : (const uint8_t *)IF_LLADDR(ifp));
#endif
return (vap == NULL ? EIO : 0); return (vap == NULL ? EIO : 0);
} }
@ -149,11 +159,17 @@ wlan_clone_destroy(struct ifnet *ifp)
ic->ic_vap_delete(vap); ic->ic_vap_delete(vap);
} }
IFC_SIMPLE_DECLARE(wlan, 0);
void void
ieee80211_vap_destroy(struct ieee80211vap *vap) ieee80211_vap_destroy(struct ieee80211vap *vap)
{ {
CURVNET_SET(vap->iv_ifp->if_vnet); CURVNET_SET(vap->iv_ifp->if_vnet);
#if __FreeBSD_version >= 1000020
if_clone_destroyif(wlan_cloner, vap->iv_ifp); if_clone_destroyif(wlan_cloner, vap->iv_ifp);
#else
if_clone_destroyif(&wlan_cloner, vap->iv_ifp);
#endif
CURVNET_RESTORE(); CURVNET_RESTORE();
} }
@ -811,13 +827,21 @@ wlan_modevent(module_t mod, int type, void *unused)
EVENTHANDLER_DEREGISTER(bpf_track, wlan_bpfevent); EVENTHANDLER_DEREGISTER(bpf_track, wlan_bpfevent);
return ENOMEM; return ENOMEM;
} }
#if __FreeBSD_version >= 1000020
wlan_cloner = if_clone_simple(wlanname, wlan_clone_create, wlan_cloner = if_clone_simple(wlanname, wlan_clone_create,
wlan_clone_destroy, 0); wlan_clone_destroy, 0);
#else
if_clone_attach(&wlan_cloner);
#endif
if_register_com_alloc(IFT_IEEE80211, wlan_alloc, wlan_free); if_register_com_alloc(IFT_IEEE80211, wlan_alloc, wlan_free);
return 0; return 0;
case MOD_UNLOAD: case MOD_UNLOAD:
if_deregister_com_alloc(IFT_IEEE80211); if_deregister_com_alloc(IFT_IEEE80211);
#if __FreeBSD_version >= 1000020
if_clone_detach(wlan_cloner); if_clone_detach(wlan_cloner);
#else
if_clone_detach(&wlan_cloner);
#endif
EVENTHANDLER_DEREGISTER(bpf_track, wlan_bpfevent); EVENTHANDLER_DEREGISTER(bpf_track, wlan_bpfevent);
EVENTHANDLER_DEREGISTER(iflladdr_event, wlan_ifllevent); EVENTHANDLER_DEREGISTER(iflladdr_event, wlan_ifllevent);
return 0; return 0;
@ -826,7 +850,11 @@ wlan_modevent(module_t mod, int type, void *unused)
} }
static moduledata_t wlan_mod = { static moduledata_t wlan_mod = {
#if __FreeBSD_version >= 1000020
wlanname, wlanname,
#else
"wlan",
#endif
wlan_modevent, wlan_modevent,
0 0
}; };