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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ff5fc4ec4d8df6d39c67a8cf65e589aaf00d970d
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

ff5fc4e by Aleksej Matis (amat@xxxxxxxxx):

    ieee80211: Fix nameclash in RM Report
    
    RM Report channel number and duration share the same abbreviation.
    Rename duration to wlan.measure.re[qp].duration.
    
    Change-Id: I0a24ffb69e1b0f1c81626ccaeaa7ce1675158465
    Reviewed-on: https://code.wireshark.org/review/34562
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 6cb9f32cf2eb6ca3320dba4af5cad2f2f57f8309)
    Reviewed-on: https://code.wireshark.org/review/34563
    

Actions performed:

    from  0b4f9e9   macOS: Don't clobber Wireshark.app during installation.
     add  ff5fc4e   ieee80211: Fix nameclash in RM Report


Summary of changes:
 epan/dissectors/packet-ieee80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)