Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / net / packet / af_packet.c

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 002d2b9..2435661 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -3426,7 +3426,7 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
         *      but then it will block.
         */
 
-       skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
+       skb = skb_recv_datagram(sk, flags, &err);
 
        /*
         *      An error occurred so return it. Because skb_recv_datagram()