I have a for_upstream_4.16 branch which you might want to pull and take a look at. It no longer compiles out of tree, so you can apply it against the current net-next kernel, with patchset for that is attached. I'm compiling this version now (which takes a while), and going out to do laundry.