- networking-re-fix-of-doc-comment-in-sockh.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Networking: re-fix of doc-comment in sock.h
has been removed from the -mm tree.  Its filename was
     networking-re-fix-of-doc-comment-in-sockh.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: Networking: re-fix of doc-comment in sock.h
From: Paul Bonser <misterpib@xxxxxxxxx>

Restoring old, correct comment for sk_filter_release, moving it to where it
should actually be, and changing new comment into proper comment for
sk_filter_rcu_free, where it actually makes sense.

The original fix submitted for this on Oct 23 mistakenly documented the
wrong function.

Signed-off-by: Paul Bonser <misterpib@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 include/net/sock.h |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff -puN include/net/sock.h~networking-re-fix-of-doc-comment-in-sockh include/net/sock.h
--- a/include/net/sock.h~networking-re-fix-of-doc-comment-in-sockh
+++ a/include/net/sock.h
@@ -908,18 +908,23 @@ static inline int sk_filter(struct sock 
 }
 
 /**
- *	sk_filter_release: Release a socket filter
- *	@rcu: rcu_head that contains the sk_filter info to remove
- *
- *	Remove a filter from a socket and release its resources.
+ * 	sk_filter_rcu_free: Free a socket filter
+ *	@rcu: rcu_head that contains the sk_filter to free
  */
- 
 static inline void sk_filter_rcu_free(struct rcu_head *rcu)
 {
 	struct sk_filter *fp = container_of(rcu, struct sk_filter, rcu);
 	kfree(fp);
 }
 
+/**
+ *	sk_filter_release: Release a socket filter
+ *	@sk: socket
+ *	@fp: filter to remove
+ *
+ *	Remove a filter from a socket and release its resources.
+ */
+
 static inline void sk_filter_release(struct sock *sk, struct sk_filter *fp)
 {
 	unsigned int size = sk_filter_len(fp);
_

Patches currently in -mm which might be from misterpib@xxxxxxxxx are

origin.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux