Changeset 4145a78


Ignore:
Timestamp:
10/25/16 13:19:44 (5 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
0cdd231, d0a067f
Parents:
6552540 (diff), 631fdbc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'EaseTheWorld?-patch-2'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_pcap.c

    r1d780e4 r631fdbc  
    765765        }
    766766
     767        stat->received_valid = 1;
     768        stat->received = pcapstats.ps_recv;
    767769        stat->dropped_valid = 1;
    768770        stat->dropped = pcapstats.ps_drop;
Note: See TracChangeset for help on using the changeset viewer.