]> git.ipfire.org Git - people/ms/dnsmasq.git/commitdiff
Tweak last commit.
authorSimon Kelley <simon@thekelleys.org.uk>
Thu, 14 May 2015 20:16:18 +0000 (21:16 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Thu, 14 May 2015 20:16:18 +0000 (21:16 +0100)
src/rfc2131.c

index a10e499ef76839f9b5694f80eece8cb2c47f7860..b95f9beadf59bac3c2a22d9e998907cec0832b59 100644 (file)
@@ -2275,16 +2275,16 @@ static void do_options(struct dhcp_context *context,
            t2val = hval;
        }
                  
+       /* ensure T1 is still < T2 */
+       if (t2val <= t1val)
+        t1val = t2val - 1; 
+
        while (fuzz > (t1val/8))
         fuzz = fuzz/2;
         
        t1val -= fuzz;
        t2val -= fuzz;
        
-       /* ensure T1 is still < T2 */
-       if (t2val <= t1val)
-        t1val = t2val - 1; 
-
        option_put(mess, end, OPTION_T1, 4, t1val);
        option_put(mess, end, OPTION_T2, 4, t2val);
     }