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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0a3e315e34e0ce997871d30f01634abeb5405fd4
Submitter: Pascal Quantin (pascal.quantin@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

0a3e315 by Pascal Quantin (pascal.quantin@xxxxxxxxx):

    MAC CTRL: fix dissection of PAUSE frame
    
    According to 802.3 table 31A-1, only opcodes from 0x0002 to 0x0006 have a timestamp
    While we are at it, rename the opcodes to a name matching the specification
    
    Bug: 11403
    Change-Id: Iaadc2b801e86523e962b4eb319541bc74de22071
    Reviewed-on: https://code.wireshark.org/review/9857
    Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal.quantin@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 8bf1237c1f5010674942dc941dca78ced9f224f9)
    Conflicts:
    	epan/dissectors/packet-maccontrol.c
    Reviewed-on: https://code.wireshark.org/review/9872
    

Actions performed:

    from  018bbdf   [Automatic update for 2015-08-02]
    adds  0a3e315   MAC CTRL: fix dissection of PAUSE frame


Summary of changes:
 epan/dissectors/packet-maccontrol.c |   58 ++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 22 deletions(-)