These two patches fix the cls_basic crash reported by Chris
Madden and the ingress locking problem.

Please apply, thanks.