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

Commit 9e8ba5f3 authored by Ursula Braun's avatar Ursula Braun Committed by David S. Miller
Browse files

af_iucv: remove unused timer infrastructure 



af_iucv contains timer infrastructure which is not exploited.
This patch removes the timer related code parts.

Signed-off-by: default avatarUrsula Braun <ursula.braun@de.ibm.com>
Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 816abbad

include/net/iucv/af_iucv.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock, 
			    poll_table *wait);

void iucv_sock_link(struct iucv_sock_list *l, struct sock *s);

void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s);

int  iucv_sock_wait_cnt(struct sock *sk, unsigned long timeo);

void iucv_accept_enqueue(struct sock *parent, struct sock *sk);

void iucv_accept_unlink(struct sock *sk);

struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock);

net/iucv/af_iucv.c

+0 −22
Original line number Diff line number Diff line
@@ -406,25 +406,6 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock, 
	return err;

}



/* Timers */

static void iucv_sock_timeout(unsigned long arg)

{

	struct sock *sk = (struct sock *)arg;



	bh_lock_sock(sk);

	sk->sk_err = ETIMEDOUT;

	sk->sk_state_change(sk);

	bh_unlock_sock(sk);



	iucv_sock_kill(sk);

	sock_put(sk);

}



static void iucv_sock_clear_timer(struct sock *sk)

{

	sk_stop_timer(sk, &sk->sk_timer);

}



static struct sock *__iucv_get_sock_by_name(char *nm)

{

	struct sock *sk;
@@ -477,7 +458,6 @@ static void iucv_sock_close(struct sock *sk) 
	int err, blen;

	struct sk_buff *skb;



	iucv_sock_clear_timer(sk);

	lock_sock(sk);



	switch (sk->sk_state) {
@@ -589,8 +569,6 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio) 
	sk->sk_protocol = proto;

	sk->sk_state	= IUCV_OPEN;



	setup_timer(&sk->sk_timer, iucv_sock_timeout, (unsigned long)sk);



	iucv_sock_link(&iucv_sk_list, sk);

	return sk;

}