[PATCH] net: fix description of skb_find_text() according to removed functionality

[PATCH] net: fix description of skb_find_text() according to removed functionality

[Igor Pylypiv]

I am not planning to to add a new user of this functions.
Use of skb_find_text() was a part of my Linux study and its
description informed me that I can use textsearch_next()
which I cannot. Just want to fix this.

On Tue, Feb 7, 2017 at 7:02 PM, David Miller <davem@davemloft.net> wrote:
>
> How about you make edits to this interface when you add an in-tree
> user as we mentioned in our responses to your previous patch?
>
> Thank you.

Re: [PATCH] net: fix description of skb_find_text() according to removed functionality

[Pablo Neira Ayuso]

On Tue, Feb 07, 2017 at 11:13:12PM -0800, Igor Pylypiv wrote:
> I am not planning to to add a new user of this functions.
> Use of skb_find_text() was a part of my Linux study and its
> description informed me that I can use textsearch_next()
> which I cannot. Just want to fix this.

Send us a patch to update documentation then. Thanks.

Re: [PATCH] Revert "net: Remove state argument from skb_find_text()"

[David Miller]

From: Igor Pylypiv <igor.pylypiv@gmail.com>
Date: Sat,  4 Feb 2017 21:48:30 -0800

> This reverts commit 059a2440fd3cf4ec57735db2c0a90401cde84fca.
> 
> Textsearch state parameter should be passed by pointer because
> its resulting value is needed for call to textsearch_next().
> 
> Signed-off-by: Igor Pylypiv <igor.pylypiv@gmail.com>

There are no users of this functionality.

Once you add one, you can submit this patch alongside of it.

[PATCH] net: fix description of skb_find_text() according to removed functionality

[Igor Pylypiv]

Textsearch state parameter was moved to local scope of the function.
This eliminates usage of textsearch_next() to find subsequent occurrences.

Fixes: 59a2440fd3cf ("net: Remove state argument from skb_find_text()")
Signed-off-by: Igor Pylypiv <igor.pylypiv@gmail.com>
---
 net/core/skbuff.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 9ccba86..90366c5 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2919,9 +2919,8 @@ static void skb_ts_finish(struct ts_config *conf, struct ts_state *state)
  * @config: textsearch configuration
  *
  * Finds a pattern in the skb data according to the specified
- * textsearch configuration. Use textsearch_next() to retrieve
- * subsequent occurrences of the pattern. Returns the offset
- * to the first occurrence or UINT_MAX if no match was found.
+ * textsearch configuration. Returns the offset to the first
+ * occurrence or UINT_MAX if no match was found.
  */
 unsigned int skb_find_text(struct sk_buff *skb, unsigned int from,
 			   unsigned int to, struct ts_config *config)

Re: [PATCH] net: fix description of skb_find_text() according to removed functionality

[David Miller]

How about you make edits to this interface when you add an in-tree
user as we mentioned in our responses to your previous patch?

Thank you.

Re: [PATCH] net: fix description of skb_find_text() according to removed functionality

[Pablo Neira Ayuso]

On Tue, Feb 07, 2017 at 06:45:37PM -0800, Igor Pylypiv wrote:
> Textsearch state parameter was moved to local scope of the function.
> This eliminates usage of textsearch_next() to find subsequent occurrences.
> 
> Fixes: 59a2440fd3cf ("net: Remove state argument from skb_find_text()")
> Signed-off-by: Igor Pylypiv <igor.pylypiv@gmail.com>

Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>