Add in some backwards compatability hacks to make -HEAD net80211 compile
on -9.