OK, I merged this up into an ipoib-cm branch and merged it into for-mm as well. I had to fix some work-struct related stuff and a few other conflicts, so please look at what I did. Testing wouldn't hurt either (I didn't have a chance to do more than build it yet). - R.