Move the bpf verifier trace check into the new switch statement in
HEAD.

Resolve the overlapping changes in hinic, where bug fixes overlap
the addition of VF support.
Signed-off-by: NDavid S. Miller <davem@davemloft.net>