Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bf1574e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

[X25]: Avoid divides and sparse warnings 



   CHECK   net/x25/af_x25.c
net/x25/af_x25.c:117:46: warning: expensive signed divide
   CHECK   net/x25/x25_facilities.c
net/x25/x25_facilities.c:209:30: warning: expensive signed divide
   CHECK   net/x25/x25_in.c
net/x25/x25_in.c:250:26: warning: expensive signed divide
   CHECK   net/x25/x25_proc.c
net/x25/x25_proc.c:48:11: warning: context imbalance in 'x25_seq_route_start'
- wrong count at exit
net/x25/x25_proc.c:72:13: warning: context imbalance in 'x25_seq_route_stop' -
unexpected unlock
net/x25/x25_proc.c:112:11: warning: context imbalance in
'x25_seq_socket_start' - wrong count at exit
net/x25/x25_proc.c:129:13: warning: context imbalance in 'x25_seq_socket_stop'
- unexpected unlock
net/x25/x25_proc.c:190:11: warning: context imbalance in
'x25_seq_forward_start' - wrong count at exit
net/x25/x25_proc.c:215:13: warning: context imbalance in
'x25_seq_forward_stop' - unexpected unlock
   CHECK   net/x25/x25_subr.c
net/x25/x25_subr.c:362:57: warning: expensive signed divide

Signed-off-by: default avatarEric Dumazet <dada1@cosmosbay.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4dde4610

net/x25/af_x25.c

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ struct compat_x25_subscrip_struct { 
int x25_addr_ntoa(unsigned char *p, struct x25_address *called_addr,

		  struct x25_address *calling_addr)

{

	int called_len, calling_len;

	unsigned int called_len, calling_len;

	char *called, *calling;

	int i;

	unsigned int i;



	called_len  = (*p >> 0) & 0x0F;

	calling_len = (*p >> 4) & 0x0F;

net/x25/x25_facilities.c

+1 −3
Original line number Diff line number Diff line
@@ -205,9 +205,7 @@ int x25_create_facilities(unsigned char *buffer, 
	}



	if (dte_facs->calling_len && (facil_mask & X25_MASK_CALLING_AE)) {

		unsigned bytecount = (dte_facs->calling_len % 2) ?

					dte_facs->calling_len / 2 + 1 :

					dte_facs->calling_len / 2;

		unsigned bytecount = (dte_facs->calling_len + 1) >> 1;

		*p++ = X25_FAC_CALLING_AE;

		*p++ = 1 + bytecount;

		*p++ = dte_facs->calling_len;

net/x25/x25_in.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametyp 
					break;

				}

				if (atomic_read(&sk->sk_rmem_alloc) >

				    (sk->sk_rcvbuf / 2))

				    (sk->sk_rcvbuf >> 1))

					x25->condition |= X25_COND_OWN_RX_BUSY;

			}

			/*

net/x25/x25_proc.c

+6 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ static __inline__ struct x25_route *x25_get_route_idx(loff_t pos) 
}



static void *x25_seq_route_start(struct seq_file *seq, loff_t *pos)

	__acquires(x25_route_list_lock)

{

	loff_t l = *pos;
@@ -70,6 +71,7 @@ static void *x25_seq_route_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static void x25_seq_route_stop(struct seq_file *seq, void *v)

	__releases(x25_route_list_lock)

{

	read_unlock_bh(&x25_route_list_lock);

}
@@ -105,6 +107,7 @@ static __inline__ struct sock *x25_get_socket_idx(loff_t pos) 
}



static void *x25_seq_socket_start(struct seq_file *seq, loff_t *pos)

	__acquires(x25_list_lock)

{

	loff_t l = *pos;
@@ -127,6 +130,7 @@ static void *x25_seq_socket_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static void x25_seq_socket_stop(struct seq_file *seq, void *v)

	__releases(x25_list_lock)

{

	read_unlock_bh(&x25_list_lock);

}
@@ -183,6 +187,7 @@ static __inline__ struct x25_forward *x25_get_forward_idx(loff_t pos) 
}



static void *x25_seq_forward_start(struct seq_file *seq, loff_t *pos)

	__acquires(x25_forward_list_lock)

{

	loff_t l = *pos;
@@ -213,6 +218,7 @@ static void *x25_seq_forward_next(struct seq_file *seq, void *v, loff_t *pos) 
}



static void x25_seq_forward_stop(struct seq_file *seq, void *v)

	__releases(x25_forward_list_lock)

{

	read_unlock_bh(&x25_forward_list_lock);

}

net/x25/x25_subr.c

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ void x25_check_rbuf(struct sock *sk) 
{

	struct x25_sock *x25 = x25_sk(sk);



	if (atomic_read(&sk->sk_rmem_alloc) < (sk->sk_rcvbuf / 2) &&

	if (atomic_read(&sk->sk_rmem_alloc) < (sk->sk_rcvbuf >> 1) &&

	    (x25->condition & X25_COND_OWN_RX_BUSY)) {

		x25->condition &= ~X25_COND_OWN_RX_BUSY;

		x25->condition &= ~X25_COND_ACK_PENDING;