The hnet enable was really needed. Added back.
Fixed switch name for Buffalo in trunk - apparently it changed eth0->switch0.
Got rid of unneeded dependencies.