ofproto-dpif: Fix statistics busted by bad merge.
authorBen Pfaff <blp@nicira.com>
Wed, 18 May 2011 21:28:24 +0000 (14:28 -0700)
committerBen Pfaff <blp@nicira.com>
Tue, 24 May 2011 18:35:21 +0000 (11:35 -0700)
commit3a88e544e07cd5c33b7eddac4e38a892897e5ed6
tree208676bfe2f17c7a9bd1e958a83af2d0e492adf3
parentbe44585c21cc8dbe097a460a930696f0350dc12d
ofproto-dpif: Fix statistics busted by bad merge.

This reimplements the statistics fixes originally implemented by the
following commits, which became broken by bad merges during the previous
"next" branch development cycle:

827ab71c97f "ofproto: Datapath statistics accounted twice."
6f1435fc8f7 "ofproto: Resubmit statistics improperly account during..."
ofproto/ofproto-dpif.c