]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-ndisc: simplify clamping of router "pref" parameter
authorLennart Poettering <lennart@poettering.net>
Tue, 24 May 2016 19:24:43 +0000 (21:24 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 26 May 2016 13:34:43 +0000 (15:34 +0200)
src/libsystemd-network/sd-ndisc.c

index d1c51b4ed6a80a4bec6530a22cd26c2bd0123c6c..c7969dbc1c4b8227e2da2c229776ab1f53c2e6a5 100644 (file)
@@ -570,14 +570,8 @@ static int ndisc_router_advertisement_recv(sd_event_source *s, int fd, uint32_t
         stateful = ra->nd_ra_flags_reserved & (ND_RA_FLAG_MANAGED | ND_RA_FLAG_OTHER);
         pref = (ra->nd_ra_flags_reserved & ND_RA_FLAG_PREF) >> 3;
 
-        switch (pref) {
-        case ND_RA_FLAG_PREF_LOW:
-        case ND_RA_FLAG_PREF_HIGH:
-                break;
-        default:
+        if (!IN_SET(pref, ND_RA_FLAG_PREF_LOW, ND_RA_FLAG_PREF_HIGH))
                 pref = ND_RA_FLAG_PREF_MEDIUM;
-                break;
-        }
 
         lifetime = be16toh(ra->nd_ra_router_lifetime);