[NET] Cleanup: DIV_ROUND_UP

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index a61a3e3..d65d17b 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -646,11 +646,7 @@ static void tcp_set_skb_tso_segs(struct sock *sk, struct sk_buff *skb, unsigned
                skb_shinfo(skb)->gso_size = 0;
                skb_shinfo(skb)->gso_type = 0;
        } else {
-               unsigned int factor;
-
-               factor = skb->len + (mss_now - 1);
-               factor /= mss_now;
-               skb_shinfo(skb)->gso_segs = factor;
+               skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len, mss_now);
                skb_shinfo(skb)->gso_size = mss_now;
                skb_shinfo(skb)->gso_type = sk->sk_gso_type;
        }

diff --git a/net/key/af_key.c b/net/key/af_key.c
index 5502df1..17b2a69 100644 (file)
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -352,16 +352,14 @@ static int verify_address_len(void *p)
 
        switch (addr->sa_family) {
        case AF_INET:
-               len  = sizeof(*sp) + sizeof(*sin) + (sizeof(uint64_t) - 1);
-               len /= sizeof(uint64_t);
+               len = DIV_ROUND_UP(sizeof(*sp) + sizeof(*sin), sizeof(uint64_t));
                if (sp->sadb_address_len != len ||
                    sp->sadb_address_prefixlen > 32)
                        return -EINVAL;
                break;
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
        case AF_INET6:
-               len  = sizeof(*sp) + sizeof(*sin6) + (sizeof(uint64_t) - 1);
-               len /= sizeof(uint64_t);
+               len = DIV_ROUND_UP(sizeof(*sp) + sizeof(*sin6), sizeof(uint64_t));
                if (sp->sadb_address_len != len ||
                    sp->sadb_address_prefixlen > 128)
                        return -EINVAL;
@@ -386,14 +384,9 @@ static int verify_address_len(void *p)
 
 static inline int pfkey_sec_ctx_len(struct sadb_x_sec_ctx *sec_ctx)
 {
-       int len = 0;
-
-       len += sizeof(struct sadb_x_sec_ctx);
-       len += sec_ctx->sadb_x_ctx_len;
-       len += sizeof(uint64_t) - 1;
-       len /= sizeof(uint64_t);
-
-       return len;
+       return DIV_ROUND_UP(sizeof(struct sadb_x_sec_ctx) +
+                           sec_ctx->sadb_x_ctx_len,
+                           sizeof(uint64_t));
 }
 
 static inline int verify_sec_ctx_len(void *p)