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

[linux-3.10.git] / net / core / datagram.c

diff --git a/net/core/datagram.c b/net/core/datagram.c
index ebba65d7e0da58b077bfe85a7c83f3805d52a55a..b71423db77851eed9bd91f06a6ac0630f967a3e5 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -78,9 +78,10 @@ static int receiver_wake_function(wait_queue_t *wait, unsigned int mode, int syn
        return autoremove_wake_function(wait, mode, sync, key);
 }
 /*
- * Wait for a packet..
+ * Wait for the last received packet to be different from skb
  */
-static int wait_for_packet(struct sock *sk, int *err, long *timeo_p)
+static int wait_for_more_packets(struct sock *sk, int *err, long *timeo_p,
+                                const struct sk_buff *skb)
 {
        int error;
        DEFINE_WAIT_FUNC(wait, receiver_wake_function);
@@ -92,7 +93,7 @@ static int wait_for_packet(struct sock *sk, int *err, long *timeo_p)
        if (error)
                goto out_err;
 
-       if (!skb_queue_empty(&sk->sk_receive_queue))
+       if (sk->sk_receive_queue.prev != skb)
                goto out;
 
        /* Socket shut down? */
@@ -131,9 +132,9 @@ out_noerr:
  *     __skb_recv_datagram - Receive a datagram skbuff
  *     @sk: socket
  *     @flags: MSG_ flags
+ *     @peeked: returns non-zero if this packet has been seen before
  *     @off: an offset in bytes to peek skb from. Returns an offset
  *           within an skb where data actually starts
- *     @peeked: returns non-zero if this packet has been seen before
  *     @err: error code returned
  *
  *     Get a datagram skbuff, understands the peeking, nonblocking wakeups
@@ -161,7 +162,7 @@ out_noerr:
 struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
                                    int *peeked, int *off, int *err)
 {
-       struct sk_buff *skb;
+       struct sk_buff *skb, *last;
        long timeo;
        /*
         * Caller is allowed not to check sk->sk_err before skb_recv_datagram()
@@ -182,13 +183,17 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
                 */
                unsigned long cpu_flags;
                struct sk_buff_head *queue = &sk->sk_receive_queue;
+               int _off = *off;
 
+               last = (struct sk_buff *)queue;
                spin_lock_irqsave(&queue->lock, cpu_flags);
                skb_queue_walk(queue, skb) {
+                       last = skb;
                        *peeked = skb->peeked;
                        if (flags & MSG_PEEK) {
-                               if (*off >= skb->len && skb->len) {
-                                       *off -= skb->len;
+                               if (_off >= skb->len && (skb->len || _off ||
+                                                        skb->peeked)) {
+                                       _off -= skb->len;
                                        continue;
                                }
                                skb->peeked = 1;
@@ -197,6 +202,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
                                __skb_unlink(skb, queue);
 
                        spin_unlock_irqrestore(&queue->lock, cpu_flags);
+                       *off = _off;
                        return skb;
                }
                spin_unlock_irqrestore(&queue->lock, cpu_flags);
@@ -206,7 +212,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned int flags,
                if (!timeo)
                        goto no_packet;
 
-       } while (!wait_for_packet(sk, err, &timeo));
+       } while (!wait_for_more_packets(sk, err, &timeo, last));
 
        return NULL;