Commit 172589cc authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller

[NET]: DIV_ROUND_UP cleanup (part two)

Hopefully captured all single statement cases under net/. I'm
not too sure if there is some policy about #includes that are
"guaranteed" (ie., in the current tree) to be available through
some other #included header, so I just added linux/kernel.h to
each changed file that didn't #include it previously.
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c45248c7
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#ifndef _SOCK_H #ifndef _SOCK_H
#define _SOCK_H #define _SOCK_H
#include <linux/kernel.h>
#include <linux/list.h> #include <linux/list.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/cache.h> #include <linux/cache.h>
...@@ -702,7 +703,7 @@ extern int sk_stream_mem_schedule(struct sock *sk, int size, int kind); ...@@ -702,7 +703,7 @@ extern int sk_stream_mem_schedule(struct sock *sk, int size, int kind);
static inline int sk_stream_pages(int amt) static inline int sk_stream_pages(int amt)
{ {
return (amt + SK_STREAM_MEM_QUANTUM - 1) / SK_STREAM_MEM_QUANTUM; return DIV_ROUND_UP(amt, SK_STREAM_MEM_QUANTUM);
} }
static inline void sk_stream_mem_reclaim(struct sock *sk) static inline void sk_stream_mem_reclaim(struct sock *sk)
......
...@@ -64,7 +64,7 @@ static inline int br_get_ticks(const unsigned char *src) ...@@ -64,7 +64,7 @@ static inline int br_get_ticks(const unsigned char *src)
{ {
unsigned long ticks = ntohs(get_unaligned((__be16 *)src)); unsigned long ticks = ntohs(get_unaligned((__be16 *)src));
return (ticks * HZ + STP_HZ - 1) / STP_HZ; return DIV_ROUND_UP(ticks * HZ, STP_HZ);
} }
/* called under bridge lock */ /* called under bridge lock */
......
...@@ -69,9 +69,8 @@ int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb) ...@@ -69,9 +69,8 @@ int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
struct dccp_sock *dp = dccp_sk(sk); struct dccp_sock *dp = dccp_sk(sk);
struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec; struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec;
/* Figure out how many options do we need to represent the ackvec */ /* Figure out how many options do we need to represent the ackvec */
const u16 nr_opts = (av->dccpav_vec_len + const u16 nr_opts = DIV_ROUND_UP(av->dccpav_vec_len,
DCCP_MAX_ACKVEC_OPT_LEN - 1) / DCCP_MAX_ACKVEC_OPT_LEN);
DCCP_MAX_ACKVEC_OPT_LEN;
u16 len = av->dccpav_vec_len + 2 * nr_opts, i; u16 len = av->dccpav_vec_len + 2 * nr_opts, i;
u32 elapsed_time; u32 elapsed_time;
const unsigned char *tail, *from; const unsigned char *tail, *from;
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
* more details. * more details.
*/ */
#include <linux/kernel.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -241,7 +242,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -241,7 +242,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
hdr = (struct ieee80211_hdr_4addr *)skb->data; hdr = (struct ieee80211_hdr_4addr *)skb->data;
ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0); ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN; blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);
last = data_len % AES_BLOCK_LEN; last = data_len % AES_BLOCK_LEN;
for (i = 1; i <= blocks; i++) { for (i = 1; i <= blocks; i++) {
...@@ -351,7 +352,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -351,7 +352,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b); ccmp_init_blocks(key->tfm, hdr, pn, data_len, b0, a, b);
xor_block(mic, b, CCMP_MIC_LEN); xor_block(mic, b, CCMP_MIC_LEN);
blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN; blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);
last = data_len % AES_BLOCK_LEN; last = data_len % AES_BLOCK_LEN;
for (i = 1; i <= blocks; i++) { for (i = 1; i <= blocks; i++) {
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
...@@ -112,7 +113,7 @@ static int inet_csk_diag_fill(struct sock *sk, ...@@ -112,7 +113,7 @@ static int inet_csk_diag_fill(struct sock *sk,
} }
#endif #endif
#define EXPIRES_IN_MS(tmo) ((tmo - jiffies) * 1000 + HZ - 1) / HZ #define EXPIRES_IN_MS(tmo) DIV_ROUND_UP((tmo - jiffies) * 1000, HZ)
if (icsk->icsk_pending == ICSK_TIME_RETRANS) { if (icsk->icsk_pending == ICSK_TIME_RETRANS) {
r->idiag_timer = 1; r->idiag_timer = 1;
...@@ -190,7 +191,7 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw, ...@@ -190,7 +191,7 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
r->id.idiag_dst[0] = tw->tw_daddr; r->id.idiag_dst[0] = tw->tw_daddr;
r->idiag_state = tw->tw_substate; r->idiag_state = tw->tw_substate;
r->idiag_timer = 3; r->idiag_timer = 3;
r->idiag_expires = (tmo * 1000 + HZ - 1) / HZ; r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ);
r->idiag_rqueue = 0; r->idiag_rqueue = 0;
r->idiag_wqueue = 0; r->idiag_wqueue = 0;
r->idiag_uid = 0; r->idiag_uid = 0;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* From code orinally in TCP * From code orinally in TCP
*/ */
#include <linux/kernel.h>
#include <net/inet_hashtables.h> #include <net/inet_hashtables.h>
#include <net/inet_timewait_sock.h> #include <net/inet_timewait_sock.h>
#include <net/ip.h> #include <net/ip.h>
...@@ -292,7 +292,7 @@ void inet_twsk_schedule(struct inet_timewait_sock *tw, ...@@ -292,7 +292,7 @@ void inet_twsk_schedule(struct inet_timewait_sock *tw,
if (timeo >= timewait_len) { if (timeo >= timewait_len) {
slot = INET_TWDR_TWKILL_SLOTS - 1; slot = INET_TWDR_TWKILL_SLOTS - 1;
} else { } else {
slot = (timeo + twdr->period - 1) / twdr->period; slot = DIV_ROUND_UP(timeo, twdr->period);
if (slot >= INET_TWDR_TWKILL_SLOTS) if (slot >= INET_TWDR_TWKILL_SLOTS)
slot = INET_TWDR_TWKILL_SLOTS - 1; slot = INET_TWDR_TWKILL_SLOTS - 1;
} }
......
...@@ -247,6 +247,7 @@ ...@@ -247,6 +247,7 @@
* TCP_CLOSE socket is finished * TCP_CLOSE socket is finished
*/ */
#include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
...@@ -2210,7 +2211,7 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features) ...@@ -2210,7 +2211,7 @@ struct sk_buff *tcp_tso_segment(struct sk_buff *skb, int features)
goto out; goto out;
mss = skb_shinfo(skb)->gso_size; mss = skb_shinfo(skb)->gso_size;
skb_shinfo(skb)->gso_segs = (skb->len + mss - 1) / mss; skb_shinfo(skb)->gso_segs = DIV_ROUND_UP(skb->len, mss);
segs = NULL; segs = NULL;
goto out; goto out;
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <linux/err.h> #include <linux/err.h>
...@@ -63,7 +64,7 @@ void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch, ...@@ -63,7 +64,7 @@ void ieee80211_aes_ccm_encrypt(struct crypto_cipher *tfm, u8 *scratch,
s_0 = scratch + AES_BLOCK_LEN; s_0 = scratch + AES_BLOCK_LEN;
e = scratch + 2 * AES_BLOCK_LEN; e = scratch + 2 * AES_BLOCK_LEN;
num_blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN; num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);
last_len = data_len % AES_BLOCK_LEN; last_len = data_len % AES_BLOCK_LEN;
aes_ccm_prepare(tfm, b_0, aad, b, s_0, b); aes_ccm_prepare(tfm, b_0, aad, b, s_0, b);
...@@ -102,7 +103,7 @@ int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch, ...@@ -102,7 +103,7 @@ int ieee80211_aes_ccm_decrypt(struct crypto_cipher *tfm, u8 *scratch,
s_0 = scratch + AES_BLOCK_LEN; s_0 = scratch + AES_BLOCK_LEN;
a = scratch + 2 * AES_BLOCK_LEN; a = scratch + 2 * AES_BLOCK_LEN;
num_blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN; num_blocks = DIV_ROUND_UP(data_len, AES_BLOCK_LEN);
last_len = data_len % AES_BLOCK_LEN; last_len = data_len % AES_BLOCK_LEN;
aes_ccm_prepare(tfm, b_0, aad, b, s_0, a); aes_ccm_prepare(tfm, b_0, aad, b, s_0, a);
......
...@@ -476,7 +476,7 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx) ...@@ -476,7 +476,7 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx)
hdrlen = ieee80211_get_hdrlen(tx->fc); hdrlen = ieee80211_get_hdrlen(tx->fc);
payload_len = first->len - hdrlen; payload_len = first->len - hdrlen;
per_fragm = frag_threshold - hdrlen - FCS_LEN; per_fragm = frag_threshold - hdrlen - FCS_LEN;
num_fragm = (payload_len + per_fragm - 1) / per_fragm; num_fragm = DIV_ROUND_UP(payload_len, per_fragm);
frags = kzalloc(num_fragm * sizeof(struct sk_buff *), GFP_ATOMIC); frags = kzalloc(num_fragm * sizeof(struct sk_buff *), GFP_ATOMIC);
if (!frags) if (!frags)
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
*/ */
#include <linux/kernel.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
...@@ -877,7 +878,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp) ...@@ -877,7 +878,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
} else { } else {
rqstp->rq_arg.page_len = len - rqstp->rq_arg.head[0].iov_len; rqstp->rq_arg.page_len = len - rqstp->rq_arg.head[0].iov_len;
rqstp->rq_respages = rqstp->rq_pages + 1 + rqstp->rq_respages = rqstp->rq_pages + 1 +
(rqstp->rq_arg.page_len + PAGE_SIZE - 1)/ PAGE_SIZE; DIV_ROUND_UP(rqstp->rq_arg.page_len, PAGE_SIZE);
} }
if (serv->sv_stats) if (serv->sv_stats)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment