One minor comment: The spacing looks off here. Tabs vs. spacing issue?

Once you fix this, I'll pull this and push both patches upstream into OVS, if that's ok with you.