This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / net / sock.h

diff --git a/include/net/sock.h b/include/net/sock.h
index a487663..0d3da11 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1086,10 +1086,8 @@ static inline int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
         * packet.
         */
        if (inet_stream_ops.bind != inet_bind &&
-           (int) sk->sk_xid > 0 && sk->sk_xid != skb->xid) {
-               err = -EPERM;
+           (int) sk->sk_xid > 0 && sk->sk_xid != skb->xid)
                goto out;
-       }
 
        /* Cast skb->rcvbuf to unsigned... It's pointless, but reduces
           number of warnings when compiling with -W --ANK