net: bareudp: fix duplicate checks of data[] expressions
authorJean Sacren <sakiwit@gmail.com>
Thu, 28 Oct 2021 18:24:53 +0000 (12:24 -0600)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Oct 2021 12:41:28 +0000 (13:41 +0100)
Both !data[IFLA_BAREUDP_PORT] and !data[IFLA_BAREUDP_ETHERTYPE] are
checked.  We should remove the checks of data[IFLA_BAREUDP_PORT] and
data[IFLA_BAREUDP_ETHERTYPE] that follow since they are always true.

Put both statements together in group and balance the space on both
sides of '=' sign.

Signed-off-by: Jean Sacren <sakiwit@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bareudp.c

index 54e321a..edffc34 100644 (file)
@@ -577,11 +577,8 @@ static int bareudp2info(struct nlattr *data[], struct bareudp_conf *conf,
                return -EINVAL;
        }
 
-       if (data[IFLA_BAREUDP_PORT])
-               conf->port =  nla_get_u16(data[IFLA_BAREUDP_PORT]);
-
-       if (data[IFLA_BAREUDP_ETHERTYPE])
-               conf->ethertype =  nla_get_u16(data[IFLA_BAREUDP_ETHERTYPE]);
+       conf->port = nla_get_u16(data[IFLA_BAREUDP_PORT]);
+       conf->ethertype = nla_get_u16(data[IFLA_BAREUDP_ETHERTYPE]);
 
        if (data[IFLA_BAREUDP_SRCPORT_MIN])
                conf->sport_min =  nla_get_u16(data[IFLA_BAREUDP_SRCPORT_MIN]);