diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2006-10-10 22:41:46 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-10-12 02:59:58 -0400 |
commit | 9469c7b4aa210ce94c6e7208cfadbd0aca0ebe08 (patch) | |
tree | 3461046e3c0a63577dc26d70246bac6892fe342c /net/dccp | |
parent | 496c98dff8e353880299168d36fa082d6fba5237 (diff) |
[NET]: Use typesafe inet_twsk() inline function instead of cast.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r-- | net/dccp/ipv4.c | 6 | ||||
-rw-r--r-- | net/dccp/ipv6.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index bf692c1c116f..7e746c4c1688 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c | |||
@@ -311,7 +311,7 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) | |||
311 | } | 311 | } |
312 | 312 | ||
313 | if (sk->sk_state == DCCP_TIME_WAIT) { | 313 | if (sk->sk_state == DCCP_TIME_WAIT) { |
314 | inet_twsk_put((struct inet_timewait_sock *)sk); | 314 | inet_twsk_put(inet_twsk(sk)); |
315 | return; | 315 | return; |
316 | } | 316 | } |
317 | 317 | ||
@@ -614,7 +614,7 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) | |||
614 | bh_lock_sock(nsk); | 614 | bh_lock_sock(nsk); |
615 | return nsk; | 615 | return nsk; |
616 | } | 616 | } |
617 | inet_twsk_put((struct inet_timewait_sock *)nsk); | 617 | inet_twsk_put(inet_twsk(nsk)); |
618 | return NULL; | 618 | return NULL; |
619 | } | 619 | } |
620 | 620 | ||
@@ -980,7 +980,7 @@ discard_and_relse: | |||
980 | goto discard_it; | 980 | goto discard_it; |
981 | 981 | ||
982 | do_time_wait: | 982 | do_time_wait: |
983 | inet_twsk_put((struct inet_timewait_sock *)sk); | 983 | inet_twsk_put(inet_twsk(sk)); |
984 | goto no_dccp_socket; | 984 | goto no_dccp_socket; |
985 | } | 985 | } |
986 | 986 | ||
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 7a47399cf31f..7171a78671aa 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -285,7 +285,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
285 | } | 285 | } |
286 | 286 | ||
287 | if (sk->sk_state == DCCP_TIME_WAIT) { | 287 | if (sk->sk_state == DCCP_TIME_WAIT) { |
288 | inet_twsk_put((struct inet_timewait_sock *)sk); | 288 | inet_twsk_put(inet_twsk(sk)); |
289 | return; | 289 | return; |
290 | } | 290 | } |
291 | 291 | ||
@@ -663,7 +663,7 @@ static struct sock *dccp_v6_hnd_req(struct sock *sk,struct sk_buff *skb) | |||
663 | bh_lock_sock(nsk); | 663 | bh_lock_sock(nsk); |
664 | return nsk; | 664 | return nsk; |
665 | } | 665 | } |
666 | inet_twsk_put((struct inet_timewait_sock *)nsk); | 666 | inet_twsk_put(inet_twsk(nsk)); |
667 | return NULL; | 667 | return NULL; |
668 | } | 668 | } |
669 | 669 | ||
@@ -1109,7 +1109,7 @@ discard_and_relse: | |||
1109 | goto discard_it; | 1109 | goto discard_it; |
1110 | 1110 | ||
1111 | do_time_wait: | 1111 | do_time_wait: |
1112 | inet_twsk_put((struct inet_timewait_sock *)sk); | 1112 | inet_twsk_put(inet_twsk(sk)); |
1113 | goto no_dccp_socket; | 1113 | goto no_dccp_socket; |
1114 | } | 1114 | } |
1115 | 1115 | ||