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

[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

include/net/sock.h

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#ifndef _SOCK_H

#define _SOCK_H



#include <linux/kernel.h>

#include <linux/list.h>

#include <linux/timer.h>

#include <linux/cache.h>
@@ -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)

{

	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)

net/bridge/br_stp_bpdu.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static inline int br_get_ticks(const unsigned char *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 */

net/dccp/ackvec.c

+2 −3
Original line number Diff line number Diff line
@@ -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_ackvec *av = dp->dccps_hc_rx_ackvec;

	/* Figure out how many options do we need to represent the ackvec */

	const u16 nr_opts = (av->dccpav_vec_len +

			     DCCP_MAX_ACKVEC_OPT_LEN - 1) /

			    DCCP_MAX_ACKVEC_OPT_LEN;

	const u16 nr_opts = DIV_ROUND_UP(av->dccpav_vec_len,

					 DCCP_MAX_ACKVEC_OPT_LEN);

	u16 len = av->dccpav_vec_len + 2 * nr_opts, i;

	u32 elapsed_time;

	const unsigned char *tail, *from;

net/ieee80211/ieee80211_crypt_ccmp.c

+3 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * more details.

 */



#include <linux/kernel.h>

#include <linux/err.h>

#include <linux/module.h>

#include <linux/init.h>
@@ -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;

	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;



	for (i = 1; i <= blocks; i++) {
@@ -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);

	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;



	for (i = 1; i <= blocks; i++) {

net/ipv4/inet_diag.c

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
 *      2 of the License, or (at your option) any later version.

 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/types.h>

#include <linux/fcntl.h>
@@ -112,7 +113,7 @@ static int inet_csk_diag_fill(struct sock *sk, 
	}

#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) {

		r->idiag_timer = 1;
@@ -190,7 +191,7 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw, 
	r->id.idiag_dst[0]    = tw->tw_daddr;

	r->idiag_state	      = tw->tw_substate;

	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_wqueue	      = 0;

	r->idiag_uid	      = 0;