diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:24:28 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 15:24:28 -0800 |
commit | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (patch) | |
tree | 0a1bc8ff40c12bb30066467e11ae9153f89514e7 /net/x25/af_x25.c | |
parent | 57d1c91fa6d9146b309b7511f6432dea2a24858b (diff) | |
parent | a2167dc62e9142b9a4bfb20f7e001c0f0a26fd8c (diff) | |
download | linux-d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66.tar.bz2 |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/x25/af_x25.c')
-rw-r--r-- | net/x25/af_x25.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 16459c7f54b2..bfabaf9cba87 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -540,12 +540,7 @@ static struct sock *x25_make_new(struct sock *osk) sk->sk_state = TCP_ESTABLISHED; sk->sk_sleep = osk->sk_sleep; sk->sk_backlog_rcv = osk->sk_backlog_rcv; - - if (sock_flag(osk, SOCK_ZAPPED)) - sock_set_flag(sk, SOCK_ZAPPED); - - if (sock_flag(osk, SOCK_DBG)) - sock_set_flag(sk, SOCK_DBG); + sock_copy_flags(sk, osk); ox25 = x25_sk(osk); x25->t21 = ox25->t21; |