Wireshark-commits: [Wireshark-commits] master-1.12 f9a4031: ams: fixed wrong offset calculation, ad

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 30 May 2015 12:32:45 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f9a40317b707b4ec7e813e7aef73844bcf3f5280
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

f9a4031 by Thomas Wiens (th.wiens@xxxxxx):

    ams: fixed wrong offset calculation, adsstate has 2 bytes
    
    Change-Id: I95813bb49dd9a51662bac521e82599c26de59e8e
    Reviewed-on: https://code.wireshark.org/review/8701
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    (cherry picked from commit 28481cda0119de767ff1baba96b793c3690eb4bf)
    Conflicts:
    	plugins/ethercat/packet-ams.c
    Reviewed-on: https://code.wireshark.org/review/8702
    

Actions performed:

    from  24350bd   Make the XQuartz fixer a separate subpackage.
    adds  f9a4031   ams: fixed wrong offset calculation, adsstate has 2 bytes


Summary of changes:
 plugins/ethercat/packet-ams.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)