summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorBojan Prtvar <prtvar.b@gmail.com>2015-02-22 11:46:35 +0100
committerDavid S. Miller <davem@davemloft.net>2015-02-22 15:59:54 -0500
commit059a2440fd3cf4ec57735db2c0a90401cde84fca (patch)
treeae1cc62a03192b53b6d4c1eb14b50d534b385797 /net/core
parentd340c862e760815bca2f2a4d8fd91dff4646a955 (diff)
downloadop-kernel-dev-059a2440fd3cf4ec57735db2c0a90401cde84fca.zip
op-kernel-dev-059a2440fd3cf4ec57735db2c0a90401cde84fca.tar.gz
net: Remove state argument from skb_find_text()
Although it is clear that textsearch state is intentionally passed to skb_find_text() as uninitialized argument, it was never used by the callers. Therefore, we can simplify skb_find_text() by making it local variable. Signed-off-by: Bojan Prtvar <prtvar.b@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/skbuff.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 88c613e..374e43b 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2865,7 +2865,6 @@ static void skb_ts_finish(struct ts_config *conf, struct ts_state *state)
* @from: search offset
* @to: search limit
* @config: textsearch configuration
- * @state: uninitialized textsearch state variable
*
* Finds a pattern in the skb data according to the specified
* textsearch configuration. Use textsearch_next() to retrieve
@@ -2873,17 +2872,17 @@ static void skb_ts_finish(struct ts_config *conf, struct ts_state *state)
* 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,
- struct ts_state *state)
+ unsigned int to, struct ts_config *config)
{
+ struct ts_state state;
unsigned int ret;
config->get_next_block = skb_ts_get_next_block;
config->finish = skb_ts_finish;
- skb_prepare_seq_read(skb, from, to, TS_SKB_CB(state));
+ skb_prepare_seq_read(skb, from, to, TS_SKB_CB(&state));
- ret = textsearch_find(config, state);
+ ret = textsearch_find(config, &state);
return (ret <= to - from ? ret : UINT_MAX);
}
EXPORT_SYMBOL(skb_find_text);
OpenPOWER on IntegriCloud