From: Igor Pylypiv <igor.pylypiv@gmail.com>
To: "David S . Miller" <davem@davemloft.net>,
Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netdev@vger.kernel.org, netfilter-devel@vger.kernel.org,
coreteam@netfilter.org
Subject: [PATCH] net: fix description of skb_find_text() according to removed functionality
Date: Tue, 7 Feb 2017 18:45:37 -0800 [thread overview]
Message-ID: <1486521937-10638-1-git-send-email-igor.pylypiv@gmail.com> (raw)
In-Reply-To: <20170207.105320.45609559819874123.davem@davemloft.net>
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)
next prev parent reply other threads:[~2017-02-08 2:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-05 5:48 [PATCH] Revert "net: Remove state argument from skb_find_text()" Igor Pylypiv
2017-02-07 12:36 ` Pablo Neira Ayuso
2017-02-07 15:53 ` David Miller
2017-02-08 2:45 ` Igor Pylypiv [this message]
2017-02-08 3:02 ` [PATCH] net: fix description of skb_find_text() according to removed functionality David Miller
2017-02-08 8:44 ` Pablo Neira Ayuso
-- strict thread matches above, loose matches on Subject: below --
2017-02-08 7:13 Igor Pylypiv
2017-02-08 8:41 ` Pablo Neira Ayuso
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1486521937-10638-1-git-send-email-igor.pylypiv@gmail.com \
--to=igor.pylypiv@gmail.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).