---

yaml --- r: 310753 b: refs/heads/master c: c6c4b97 h: refs/heads/master i: 310751: 45bdc50 v: v3
git-mirror · Jun 9, 2012 · b571cde · b571cde
1 parent b6e20b0
commit b571cde
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd8f76c0a0c6fce0b2cf23c9bd0123f91453f46d
+refs/heads/master: c6c4b97c6b7003e8082dd43db224c1d1f7a24aa2
diff --git a/trunk/net/core/filter.c b/trunk/net/core/filter.c
@@ -616,9 +616,9 @@ static int __sk_prepare_filter(struct sk_filter *fp)
 /**
  *	sk_unattached_filter_create - create an unattached filter
  *	@fprog: the filter program
- *	@sk: the socket to use
+ *	@pfp: the unattached filter that is created
  *
- * Create a filter independent ofr any socket. We first run some
+ * Create a filter independent of any socket. We first run some
  * sanity checks on it to make sure it does not explode on us later.
  * If an error occurs or there is insufficient memory for the filter
  * a negative errno code is returned. On success the return is zero.

diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
@@ -3361,7 +3361,7 @@ EXPORT_SYMBOL(kfree_skb_partial);
  * @to: prior buffer
  * @from: buffer to add
  * @fragstolen: pointer to boolean
- *
+ * @delta_truesize: how much more was allocated than was requested
  */
 bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
 		      bool *fragstolen, int *delta_truesize)