OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1311-ge8c4fc4

Gerrit Code Review
Tue, 21 Jun 2011 18:59:18 -0700 (PDT)

The following commit has been merged in the master branch:
commit 784babbea1247660f39463403233589a74c6e73b
Author: Simon Wilkinson <>
Date:   Sat Jun 18 11:48:45 2011 +0100

    rx: Make clock_Add correctly add to itself
    With the existing clock_Add code, the following:
        struct clock a = {2, 800000};
        clock_Add(&a, &a);
    gives a clock value of {6, 600000}, rather than the expected {5, 60000}.
    This is because the ordering of instructions leads it to double count
    the carry on the seconds field. Reorder the instructions so that the
    carry is correctly applied.
    Change-Id: Ia71b387ce521a11e4caf9ec200907efe1d2be8ff
    Reviewed-by: Derrick Brashear <>
    Reviewed-by: Jeffrey Altman <>
    Tested-by: Jeffrey Altman <>

 src/rx/rx_clock.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

OpenAFS Master Repository