From ed462aa268052d92cf0ed87519047750b6b3209a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 14 Feb 2010 22:35:47 -0800 Subject: [PATCH] --- yaml --- r: 184104 b: refs/heads/master c: 1a5778aa000ebfec7f07eed0ffa2852ffb5d16bb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 4 ++-- trunk/include/net/sock.h | 2 +- trunk/net/sunrpc/rpc_pipe.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index da084c2ccd71..3db8c9d1b675 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ecccb74dc91e22496a142b103ba958f93c29275 +refs/heads/master: 1a5778aa000ebfec7f07eed0ffa2852ffb5d16bb diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index ae836fded530..ba0f8e3a9cda 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -738,7 +738,7 @@ static inline struct sk_buff *skb_unshare(struct sk_buff *skb, } /** - * skb_peek + * skb_peek - peek at the head of an &sk_buff_head * @list_: list to peek at * * Peek an &sk_buff. Unlike most other operations you _MUST_ @@ -759,7 +759,7 @@ static inline struct sk_buff *skb_peek(struct sk_buff_head *list_) } /** - * skb_peek_tail + * skb_peek_tail - peek at the tail of an &sk_buff_head * @list_: list to peek at * * Peek an &sk_buff. Unlike most other operations you _MUST_ diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index c8d400063c16..580d51fa28e9 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -1049,7 +1049,7 @@ extern void sk_common_release(struct sock *sk); extern void sock_init_data(struct socket *sock, struct sock *sk); /** - * sk_filter_release: Release a socket filter + * sk_filter_release - release a socket filter * @fp: filter to remove * * Remove a filter from a socket and release its resources. diff --git a/trunk/net/sunrpc/rpc_pipe.c b/trunk/net/sunrpc/rpc_pipe.c index 49278f830367..9ea45383480e 100644 --- a/trunk/net/sunrpc/rpc_pipe.c +++ b/trunk/net/sunrpc/rpc_pipe.c @@ -78,7 +78,7 @@ rpc_timeout_upcall_queue(struct work_struct *work) } /** - * rpc_queue_upcall + * rpc_queue_upcall - queue an upcall message to userspace * @inode: inode of upcall pipe on which to queue given message * @msg: message to queue *