ofproto-dpif: Fix bond accounting.
authorBen Pfaff <blp@nicira.com>
Wed, 18 May 2011 23:40:21 +0000 (16:40 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 19 May 2011 17:51:45 +0000 (10:51 -0700)
commitd78be13bc9767d38affb8816a5f4cd80a0bca5d8
treebe5ec1f5ffd84f13388218b45342e625d1d59844
parent44dfa85908edbf26b5979082175e7c32a6aa974e
ofproto-dpif: Fix bond accounting.

Calls to bond_account() and bond_choose_output_slave() had different ideas
for the vlan of a flow that did not have a tagged VLAN.  The call to
bond_choose_output_slave() passed OFP_VLAN_NONE in this case, the call to
bond_account() passed 0.  This meant that packets not on a VLAN weren't
accounted properly, which typically caused bond/show to show "0 kB load"
on active hashes.  Obviously that broke rebalancing too.

I've verified that this fixes accounting.  I haven't directly verified that
it fixes rebalancing, so it's possible that there is another issue too.

Reported-by: Michael Mao <mmao@nicira.com>
ofproto/ofproto-dpif.c