From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 24 May 2016 19:24:43 +0000 (+0200)
Subject: sd-ndisc: simplify clamping of router "pref" parameter
X-Git-Tag: v231~247^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=745c5152c210738e20bae5e377262e270f7a0335;p=platform%2Fupstream%2Fsystemd.git

sd-ndisc: simplify clamping of router "pref" parameter
---

diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index d1c51b4..c7969db 100644
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -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);