From 0a6c2ab444002f8c70d5a10c15f09d810c7f8562 Mon Sep 17 00:00:00 2001
From: Shaun Pereira <pereira.shaun@gmail.com>
Date: Fri, 6 Jan 2006 13:11:35 -0800
Subject: [PATCH] --- yaml --- r: 16663 b: refs/heads/master c:
 a20a8554796bc4e28879beabd0db4bf3ce77b686 h: refs/heads/master i:   16661:
 494b07d5ec7d91cc23165ac626c4452f06458cfb   16659:
 d40d312b07acdd09ef7f17e46446a81f45ecb9d1   16655:
 52a9f1f2a364fb3de530d195059f0cbcd2c05b64 v: v3

---
 [refs]                 | 2 +-
 trunk/net/x25/af_x25.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index cac3a575f784..c96d420188e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4bad4dc919573dbe9a5b41dd9edff279e99822d7
+refs/heads/master: a20a8554796bc4e28879beabd0db4bf3ce77b686
diff --git a/trunk/net/x25/af_x25.c b/trunk/net/x25/af_x25.c
index 16459c7f54b2..bfabaf9cba87 100644
--- a/trunk/net/x25/af_x25.c
+++ b/trunk/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;