---

yaml --- r: 16663 b: refs/heads/master c: a20a855 h: refs/heads/master i: 16661: 494b07d 16659: d40d312 16655: 52a9f1f v: v3
git-mirror · Jan 6, 2006 · 0a6c2ab · 0a6c2ab
1 parent 73f2284
commit 0a6c2ab
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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;