wifitap: Fix import errors. Clean up.

Scapy changed its API around a bit. The wifitap upstream hasn't adapted.