Port newer net code from Evervolv 2.6.38 kernel for bcmdhd
Fix conflicts