[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=97f91f1aeefe59d87cabcb74ebc77a0ab2d0695f
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

97f91f1 by Guy Harris (guy@xxxxxxxxxxxx):

    Copy over part of SVN revision 54503 from the trunk.
    
    The previous change depended on that.
    
    Change-Id: Ifed741659920e23aeef7d8626b10a6b996bd6afc
    Reviewed-on: https://code.wireshark.org/review/8671
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  1e4a593   is_linux_bonding_device() is only used if we HAVE_PCAP_CREATE so only define it if we HAVE_PCAP_CREATE.
    adds  97f91f1   Copy over part of SVN revision 54503 from the trunk.


Summary of changes:
 epan/dissectors/packet-atm.c |  121 +++++++++++++++++++++++-------------------
 1 file changed, 65 insertions(+), 56 deletions(-)