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

[linux-2.6-microblaze.git] / net / core / datagram.c

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 454ec89..6877c43 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -68,7 +68,7 @@ static inline int connection_based(struct sock *sk)
        return sk->sk_type == SOCK_SEQPACKET || sk->sk_type == SOCK_STREAM;
 }
 
-static int receiver_wake_function(wait_queue_t *wait, unsigned int mode, int sync,
+static int receiver_wake_function(wait_queue_entry_t *wait, unsigned int mode, int sync,
                                  void *key)
 {
        unsigned long bits = (unsigned long)key;
@@ -220,7 +220,7 @@ struct sk_buff *__skb_try_recv_from_queue(struct sock *sk,
  *
  *     This function will lock the socket if a skb is returned, so
  *     the caller needs to unlock the socket in that case (usually by
- *     calling skb_free_datagram). Returns NULL with *err set to
+ *     calling skb_free_datagram). Returns NULL with @err set to
  *     -EAGAIN if no data was available or to some other value if an
  *     error was detected.
  *