update openvswitch.h to latest and remove redundant code

Reviewer: @rlane