I applied this and the mlx4 version. I tried to fix it up so it didn't print screwed up messages like NOP failed, aborting trying again without MSI-X trying again without MSI-X Please take a look at my for-2.6.24 branch if you get a chance to make sure I didn't screw up when I did that. - R.