diff options
author | Ursula Braun <ursula.braun@de.ibm.com> | 2011-12-19 17:56:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-12-20 14:05:03 -0500 |
commit | 9e8ba5f3ec35cba4fd8a8bebda548c4db2651e40 (patch) | |
tree | dcc78db4e9c795f4ae31d5344159064d79dd34ef | |
parent | 816abbadf981e64b2342e1a875592623619560a4 (diff) |
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: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/iucv/af_iucv.h | 1 | ||||
-rw-r--r-- | net/iucv/af_iucv.c | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h index f2419cf44cef..e385f856706f 100644 --- a/include/net/iucv/af_iucv.h +++ b/include/net/iucv/af_iucv.h | |||
@@ -146,7 +146,6 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock, | |||
146 | poll_table *wait); | 146 | poll_table *wait); |
147 | void iucv_sock_link(struct iucv_sock_list *l, struct sock *s); | 147 | void iucv_sock_link(struct iucv_sock_list *l, struct sock *s); |
148 | void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s); | 148 | void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s); |
149 | int iucv_sock_wait_cnt(struct sock *sk, unsigned long timeo); | ||
150 | void iucv_accept_enqueue(struct sock *parent, struct sock *sk); | 149 | void iucv_accept_enqueue(struct sock *parent, struct sock *sk); |
151 | void iucv_accept_unlink(struct sock *sk); | 150 | void iucv_accept_unlink(struct sock *sk); |
152 | struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock); | 151 | struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock); |
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index ad90cf29c96e..109e5123c9f1 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c | |||
@@ -406,25 +406,6 @@ static int afiucv_hs_send(struct iucv_message *imsg, struct sock *sock, | |||
406 | return err; | 406 | return err; |
407 | } | 407 | } |
408 | 408 | ||
409 | /* Timers */ | ||
410 | static void iucv_sock_timeout(unsigned long arg) | ||
411 | { | ||
412 | struct sock *sk = (struct sock *)arg; | ||
413 | |||
414 | bh_lock_sock(sk); | ||
415 | sk->sk_err = ETIMEDOUT; | ||
416 | sk->sk_state_change(sk); | ||
417 | bh_unlock_sock(sk); | ||
418 | |||
419 | iucv_sock_kill(sk); | ||
420 | sock_put(sk); | ||
421 | } | ||
422 | |||
423 | static void iucv_sock_clear_timer(struct sock *sk) | ||
424 | { | ||
425 | sk_stop_timer(sk, &sk->sk_timer); | ||
426 | } | ||
427 | |||
428 | static struct sock *__iucv_get_sock_by_name(char *nm) | 409 | static struct sock *__iucv_get_sock_by_name(char *nm) |
429 | { | 410 | { |
430 | struct sock *sk; | 411 | struct sock *sk; |
@@ -477,7 +458,6 @@ static void iucv_sock_close(struct sock *sk) | |||
477 | int err, blen; | 458 | int err, blen; |
478 | struct sk_buff *skb; | 459 | struct sk_buff *skb; |
479 | 460 | ||
480 | iucv_sock_clear_timer(sk); | ||
481 | lock_sock(sk); | 461 | lock_sock(sk); |
482 | 462 | ||
483 | switch (sk->sk_state) { | 463 | switch (sk->sk_state) { |
@@ -589,8 +569,6 @@ static struct sock *iucv_sock_alloc(struct socket *sock, int proto, gfp_t prio) | |||
589 | sk->sk_protocol = proto; | 569 | sk->sk_protocol = proto; |
590 | sk->sk_state = IUCV_OPEN; | 570 | sk->sk_state = IUCV_OPEN; |
591 | 571 | ||
592 | setup_timer(&sk->sk_timer, iucv_sock_timeout, (unsigned long)sk); | ||
593 | |||
594 | iucv_sock_link(&iucv_sk_list, sk); | 572 | iucv_sock_link(&iucv_sk_list, sk); |
595 | return sk; | 573 | return sk; |
596 | } | 574 | } |