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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7d1f775c76b0c8fe11f7bc5eeac0dcb9904a4e50
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

7d1f775 by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    MIP6: Don't no need to have a another subtree (with wrong length for LLA)
    
    Conflicts:
    	epan/dissectors/packet-mip6.c
    
    Bug: 10627
    Change-Id: Ia6940ef7624a92d453cada6693bcd7f4e145a5b6
    Reviewed-on: https://code.wireshark.org/review/12453
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 0d2fce11894f9e91959341ad9ee38bf9da296547)
    Reviewed-on: https://code.wireshark.org/review/12458
    (cherry picked from commit 29daa1d29496b2d92c1bb8a701e51d962c94715b)
    Reviewed-on: https://code.wireshark.org/review/12465
    Tested-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    

Actions performed:

    from  4e00398   [Automatic update for 2015-12-06]
    adds  7d1f775   MIP6: Don't no need to have a another subtree (with wrong length for LLA)


Summary of changes:
 epan/dissectors/packet-mip6.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)