Commit b1d445df authored by David S. Miller's avatar David S. Miller

Merge bk://kernel.bkbits.net/acme/net-2.6

into nuts.davemloft.net:/disk1/BK/net-2.6
parents 6c654e21 f17aaf12
......@@ -312,7 +312,6 @@ static int inet_create(struct socket *sock, int protocol)
sk_set_owner(sk, THIS_MODULE);
sk->sk_destruct = inet_sock_destruct;
sk->sk_zapped = 0;
sk->sk_family = PF_INET;
sk->sk_protocol = protocol;
sk->sk_backlog_rcv = sk->sk_prot->backlog_rcv;
......
......@@ -1593,14 +1593,6 @@ void tcp_destroy_sock(struct sock *sk)
/* If it has not 0 inet_sk(sk)->num, it must be bound */
BUG_TRAP(!inet_sk(sk)->num || tcp_sk(sk)->bind_hash);
#ifdef TCP_DEBUG
if (sk->sk_zapped) {
printk(KERN_DEBUG "TCP: double destroy sk=%p\n", sk);
sock_hold(sk);
}
sk->sk_zapped = 1;
#endif
sk->sk_prot->destroy(sk);
sk_stream_kill_queues(sk);
......
......@@ -563,8 +563,6 @@ static int tcpdiag_dump(struct sk_buff *skb, struct netlink_callback *cb)
if (num < s_num)
continue;
if (!(r->tcpdiag_states & (1 << sk->sk_zapped)))
continue;
if (r->id.tcpdiag_sport != inet->sport &&
r->id.tcpdiag_sport)
continue;
......
......@@ -191,7 +191,6 @@ static int inet6_create(struct socket *sock, int protocol)
}
sk->sk_destruct = inet6_sock_destruct;
sk->sk_zapped = 0;
sk->sk_family = PF_INET6;
sk->sk_protocol = protocol;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment